ASN.1: fix Hashes definition, add HashesOfSnapshot def

awwad · awwad · commit 1885194aa5c1 · 2018-11-08T16:36:20.000-05:00
These will both hopefully not be necessary in the end, since they're
used in only one way each and the definitions should just directly
say things like
   meta: SetOf(componentType=HashOfSnapshot())
instead of having an extra level, but for now this is easier to
debug.

Separately, the Hashes definition was incorrectly Set() instead of
SetOf() Hash

Signed-off-by: Sebastien Awwad &lt;sebastien.awwad@gmail.com&gt;
diff --git a/tuf/encoding/asn1_metadata_definitions.py b/tuf/encoding/asn1_metadata_definitions.py
@@ -75,7 +75,7 @@ class Hash(univ.Sequence):
       NamedType('digest', univ.OctetString()))
 
 # TEMPORARY, FOR DEBUGGING ONLY; DO NOT MERGE
-class Hashes(univ.Set):
+class Hashes(univ.SetOf):
   componentType = Hash()
 
 
@@ -135,13 +135,16 @@ class HashOfSnapshot(univ.Sequence):
       NamedType('num-hashes', IntegerNatural()),
       NamedType('hashes', univ.SetOf(componentType=Hash()))) # unordered
 
+class HashesOfSnapshot(univ.SetOf):
+  componentType = HashOfSnapshot()
+
 class TimestampMetadata(univ.Sequence):
   componentType = NamedTypes(
       NamedType('type', char.VisibleString()),
       NamedType('expires', IntegerNatural()),
       NamedType('version', IntegerNatural()),
       NamedType('num-meta', IntegerNatural()),
-      NamedType('meta', univ.SetOf(componentType=HashOfSnapshot())) # unordered
+      NamedType('meta', HashesOfSnapshot()) #univ.SetOf(componentType=HashOfSnapshot())) # unordered
   )
 
 
diff --git a/tuf/encoding/metadata_definitions.asn1 b/tuf/encoding/metadata_definitions.asn1
@@ -137,6 +137,8 @@ TUFMetadataDefinitions DEFINITIONS AUTOMATIC TAGS ::= BEGIN
     digest              OCTET STRING
   }
 
+  Hashes ::= SET OF Hash
+
 
   Signature ::= SEQUENCE {
     keyid               OCTET STRING,

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ TUFMetadataDefinitions DEFINITIONS AUTOMATIC TAGS ::= BEGIN`
`137`	`137`	`digest OCTET STRING`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ Hashes ::= SET OF Hash`
	`141`	`+`
`140`	`142`
`141`	`143`	`Signature ::= SEQUENCE {`
`142`	`144`	`keyid OCTET STRING,`