spec: Define the publisher topology structure

Signed-off-by: Michael Brown <[email protected]>

Author: mcb30

spec/Makefile

@@ -18,7 +18,6 @@ ASN1_FRAGS = cx-generatortype.asn1 \
 	     cx-signaturevalue--signaturevalues.asn1 \
 	     cx-seedreport.asn1 \
 	     cx-publicationversion.asn1 \
-	     cx-publicationaudience.asn1 \
 	     cx-alertlevel.asn1 \
 	     cx-seedvalues.asn1 \
 	     cx-notification.asn1 \

spec/cx-publicationaudience.asn1

@@ -1,6 +1,7 @@
 TBSPublicationData ::= SEQUENCE {
     version                     PublicationVersion,
-    intendedAudience            PublicationAudience,
+    zone                        UTF8String,
+    aggregated                  BOOLEAN DEFAULT TRUE,
     publishedAt                 GeneralizedTime,
     nextUpdateNotBefore         GeneralizedTime,
     nextUpdateNotAfter          GeneralizedTime,

spec/cx-tbspublicationdata.asn1

@@ -50,8 +50,6 @@ SeedReport ::= SEQUENCE {
 
 PublicationVersion ::= INTEGER { v1(1) }
 
-PublicationAudience ::= INTEGER { observer(1), publisher(2) }
-
 AlertLevel ::= INTEGER { no-alert(0), debug-alert(1), expired(2),
                          unknown-alert(3), symptomatic(4), diagnosed(5) }
 
@@ -70,7 +68,8 @@ UpdateURLs ::= SEQUENCE SIZE (0..MAX) OF UpdateURL
 
 TBSPublicationData ::= SEQUENCE {
     version                     PublicationVersion,
-    intendedAudience            PublicationAudience,
+    zone                        UTF8String,
+    aggregated                  BOOLEAN DEFAULT TRUE,
     publishedAt                 GeneralizedTime,
     nextUpdateNotBefore         GeneralizedTime,
     nextUpdateNotAfter          GeneralizedTime,