Merge branch 'develop' into vladimir-v-diaz-patch-5

AUTHORS.txt

@@ -1,3 +1,7 @@
+The TUF project is managed by Justin Cappos at NYU (jcappos@nyu.edu).
+
+Contributors:
+
 Arturo Filastò
 Benno Fünfstück
 David Halls

README.rst

@@ -148,7 +148,7 @@ https://updateframework.com
 
 Mailing List
 ------------
-Please visit `https://groups.google.com/forum/?fromgroups#!forum/theupdateframework <https://groups.google.com/forum/?fromgroups#!forum/theupdateframework>`_ if you would like to contact the TUF team.  Questions, feedback, and suggestions are welcomed in this low-volume mailing list.
+Please visit `https://groups.google.com/forum/?fromgroups#!forum/theupdateframework <https://groups.google.com/forum/?fromgroups#!forum/theupdateframework>`_ if you would like to contact the TUF team.  Questions, feedback, and suggestions are welcomed in this low-volume mailing list. 
 
 A group feed is available at: https://groups.google.com/forum/feed/theupdateframework/msgs/atom.xml?num=50
 
@@ -257,8 +257,11 @@ we provide for this purpose.
 Acknowledgements
 ----------------
 
+This project is managed by Prof. Justin Cappos and other members of the
+`Secure Systems Lab <https://ssl.engineering.nyu.edu/>`_ at NYU.
+
 This material is based upon work supported by the National Science
-Foundation under Grant No. CNS-1345049 and CNS-0959138. Any opinions,
+Foundation under Grant Nos. CNS-1345049 and CNS-0959138. Any opinions,
 findings, and conclusions or recommendations expressed in this material
 are those of the author(s) and do not necessarily reflect the views of
 the National Science Foundation.

tuf/repository_lib.py

@@ -1548,14 +1548,11 @@ def generate_snapshot_metadata(metadata_directory, version, expiration_date,
 
   metadata_directory = _check_directory(metadata_directory)
 
-  # Set the fileinfo of 'root.json', and the versioninfo of
-  # 'targets.json'.  'fileinfodict' shall contain the version number of all
-  # available delegated roles on the repository.
+  # Snapshot's 'fileinfodict' shall contain the version number of Root,
+  # Targets, and all delegated roles fo the repository.
   fileinfodict = {}
-  root_path = os.path.join(metadata_directory, root_filename + '.json')
-  length, hashes = securesystemslib.util.get_file_details(root_path)
-  root_version = get_metadata_versioninfo('root', repository_name)
-  fileinfodict[ROOT_FILENAME] = tuf.formats.make_fileinfo(length, hashes, version=root_version['version'])
+  fileinfodict[ROOT_FILENAME] = get_metadata_versioninfo(root_filename,
+      repository_name)
   fileinfodict[TARGETS_FILENAME] = get_metadata_versioninfo(targets_filename,
       repository_name)