use DER types, now that we can use the DER names

Author: alandekok

share/dictionary/der/dictionary

@@ -9,6 +9,16 @@
 #
 BEGIN PROTOCOL DER      11354911
 
+#
+#  Note that the data types for DER are local to DER!
+#
+# * `integer` is packed as 1, 2, or more bytes, depending on its size.
+#   The server manages all DER numbers as `int64`.
+#
+# * `null` is an empty value.  
+#   The server manages all DER `null` as `bool`.
+#
+
 $INCLUDE dictionary.common
 $INCLUDE dictionary.oids
 $INCLUDE dictionary.rfc2986

share/dictionary/der/dictionary.common

@@ -7,10 +7,10 @@ BEGIN GeneralName
 
 ATTRIBUTE	otherName				0	sequence option=0
 BEGIN otherName
-DEFINE	type-id						string der_type=oid
-DEFINE	Value-thing					tlv der_type=sequence,class=context-specific,tagnum=0
+DEFINE	type-id						oid
+DEFINE	Value-thing					sequence class=context-specific,tagnum=0
 BEGIN Value-thing
-DEFINE	userPrincipalName				string der_type=utf8string
+DEFINE	userPrincipalName				utf8string
 END Value-thing
 END otherName
 
@@ -42,9 +42,9 @@ END DirectoryName
 DEFINE	GeneralSubtree					sequence
 BEGIN GeneralSubtree
 DEFINE	base						sequence        clone=GeneralName
-DEFINE	minimum						int64		option=0,has_default
+DEFINE	minimum						integer		option=0,has_default
 VALUE	minimum				DEFAULT			0
-DEFINE	maximum						int64		option=1
+DEFINE	maximum						integer		option=1
 END GeneralSubtree
 
 DEFINE	Name						sequence

share/dictionary/der/dictionary.extensions

@@ -14,10 +14,10 @@ DEFINE	accessLocation					choice
 BEGIN accessLocation
 ATTRIBUTE	otherName				0	sequence option=0
 BEGIN otherName
-DEFINE	type-id						string der_type=oid
-DEFINE	Value-thing					tlv der_type=sequence,class=context-specific,tagnum=0
+DEFINE	type-id						oid
+DEFINE	Value-thing					sequence class=context-specific,tagnum=0
 BEGIN Value-thing
-DEFINE	userPrincipalName				string der_type=utf8string
+DEFINE	userPrincipalName				utf8string
 END Value-thing
 END otherName
 
@@ -40,10 +40,10 @@ DEFINE	accessLocation					choice
 BEGIN accessLocation
 ATTRIBUTE	otherName				0	sequence option=0
 BEGIN otherName
-DEFINE	type-id						string der_type=oid
-DEFINE	Value-thing					tlv der_type=sequence,class=context-specific,tagnum=0
+DEFINE	type-id						oid
+DEFINE	Value-thing					sequence class=context-specific,tagnum=0
 BEGIN Value-thing
-DEFINE	userPrincipalName				string der_type=utf8string
+DEFINE	userPrincipalName				utf8string
 END Value-thing
 END otherName
 
@@ -78,7 +78,7 @@ ATTRIBUTE	basicConstraints			2.5.29.19	sequence is_oid_leaf
 BEGIN 2.5.29.19
 DEFINE	cA						boolean has_default
 VALUE	cA				DEFAULT			false
-DEFINE	pathLenConstraint				int64
+DEFINE	pathLenConstraint				integer
 END 2.5.29.19
 
 ATTRIBUTE	nameConstraints				2.5.29.30	sequence        is_oid_leaf
@@ -96,7 +96,7 @@ BEGIN distributionPointName
 ATTRIBUTE	fullName				0	group   ref=GeneralName,der_type=sequence,sequence_of=choice,option=0
 ATTRIBUTE	nameRelativeToCRLIssuer			1	sequence        option=1
 BEGIN nameRelativeToCRLIssuer
-DEFINE	RelativeDistinguishedName			tlv der_type=set
+DEFINE	RelativeDistinguishedName			set
 BEGIN RelativeDistinguishedName
 DEFINE	AttributeTypeandValue				group ref=OID-Tree,is_pair
 END RelativeDistinguishedName
@@ -168,7 +168,7 @@ BEGIN distributionPointName
 ATTRIBUTE	fullName				0	group   ref=GeneralName,der_type=sequence,sequence_of=choice,option=0
 ATTRIBUTE	nameRelativeToCRLIssuer			1	sequence        option=1
 BEGIN nameRelativeToCRLIssuer
-DEFINE	RelativeDistinguishedName			tlv der_type=set
+DEFINE	RelativeDistinguishedName			set
 BEGIN RelativeDistinguishedName
 DEFINE	AttributeTypeandValue				group ref=OID-Tree,is_pair
 END RelativeDistinguishedName
@@ -192,4 +192,4 @@ DEFINE	cRLIssuer					group   ref=GeneralName,der_type=sequence,sequence_of=choic
 
 END distributionPoint
 
-ATTRIBUTE	inhibitAnyPolicy			2.5.29.54	int64 is_oid_leaf
+ATTRIBUTE	inhibitAnyPolicy			2.5.29.54	integer is_oid_leaf

share/dictionary/der/dictionary.oids

@@ -19,9 +19,9 @@ VALUE 1.2.840.10045.4.3.3       DEFAULT false
 ATTRIBUTE	rsadsi					1.2.840.113549	tlv
 ATTRIBUTE	pkcs					1.2.840.113549.1	tlv
 ATTRIBUTE	pkcs-1					1.2.840.113549.1.1	tlv
-ATTRIBUTE	rsaEncryption				1.2.840.113549.1.1.1	bool    is_oid_leaf,der_type=null
+ATTRIBUTE	rsaEncryption				1.2.840.113549.1.1.1	null    is_oid_leaf
 
-ATTRIBUTE	sha256WithRSAEncryption			1.2.840.113549.1.1.11	bool    is_oid_leaf,der_type=null
+ATTRIBUTE	sha256WithRSAEncryption			1.2.840.113549.1.1.11	null    is_oid_leaf
 
 ATTRIBUTE	identified-organization			1.3	tlv
 ATTRIBUTE	dod					1.3.6	tlv

share/dictionary/der/dictionary.rfc2986

@@ -7,16 +7,16 @@ BEGIN CertificateRequest
 
 DEFINE	certificationRequestInfo			tlv
 BEGIN certificationRequestInfo
-DEFINE	version						int64
+DEFINE	version						integer
 
 DEFINE	subject						tlv
 BEGIN subject
-DEFINE	RelativeDistinguishedName			tlv der_type=set
+DEFINE	RelativeDistinguishedName			set
 BEGIN RelativeDistinguishedName
 DEFINE	AttributeTypeandValue				tlv
 BEGIN AttributeTypeAndValue
-DEFINE	OID						string der_type=oid
-DEFINE	Value-Thing					string der_type=utf8string
+DEFINE	OID						oid
+DEFINE	Value-Thing					utf8string
 END AttributeTypeAndValue
 END RelativeDistinguishedName
 END subject
@@ -25,16 +25,16 @@ DEFINE	subjectPublicKeyInfo				tlv
 BEGIN subjectPublicKeyInfo
 DEFINE	algorithm					tlv
 BEGIN algorithm
-DEFINE	OID						string der_type=oid
+DEFINE	OID						oid
 END algorithm
-DEFINE	subjectPublicKey				octets der_type=bitstring
+DEFINE	subjectPublicKey				bitstring
 END subjectPublicKeyInfo
 
-DEFINE	Attributes					tlv class=context-specific,tagnum=0,der_type=sequence
+DEFINE	Attributes					sequence class=context-specific,tagnum=0
 BEGIN Attributes
 DEFINE	Attribute-thing					tlv
 BEGIN Attribute-thing
-DEFINE	OID						string der_type=oid
+DEFINE	OID						oid
 DEFINE	Extensions					group ref=OID-Tree,der_type=set,is_extensions
 END Attribute-thing
 END Attributes
@@ -43,8 +43,8 @@ END certificationRequestInfo
 
 DEFINE	signatureAlgorithm				tlv
 BEGIN signatureAlgorithm
-DEFINE	OID						string der_type=oid
+DEFINE	OID						oid
 END signatureAlgorithm
 
-DEFINE	signature					octets der_type=bitstring
+DEFINE	signature					bitstring
 END CertificateRequest

share/dictionary/der/dictionary.rfc5280

@@ -7,16 +7,16 @@ BEGIN Certificate
 
 DEFINE	tbsCertificate					tlv
 BEGIN tbsCertificate
-DEFINE	version						tlv class=context-specific,tagnum=0,der_type=sequence
+DEFINE	version						sequence class=context-specific,tagnum=0
 BEGIN version
-DEFINE	VersionNum					int64
+DEFINE	VersionNum					integer
 END version
 DEFINE	serialNumber					octets tagnum=2
 DEFINE	signature					group ref=OID-Tree,is_pair
 
-DEFINE	issuer						tlv der_type=sequence,sequence_of=set,is_pairs
+DEFINE	issuer						sequence sequence_of=set,is_pairs
 BEGIN issuer
-DEFINE	RelativeDistinguishedName			tlv der_type=set
+DEFINE	RelativeDistinguishedName			set
 BEGIN RelativeDistinguishedName
 DEFINE	AttributeTypeAndValue				group ref=OID-Tree,is_pair
 END RelativeDistinguishedName
@@ -30,7 +30,7 @@ END validity
 
 DEFINE	subject						tlv sequence_of=set,is_pairs
 BEGIN subject
-DEFINE	RelativeDistinguishedName			tlv der_type=set
+DEFINE	RelativeDistinguishedName			set
 BEGIN RelativeDistinguishedName
 DEFINE	AttributeTypeandValue				group ref=OID-Tree,is_pair
 END RelativeDistinguishedName
@@ -39,7 +39,7 @@ END subject
 DEFINE	subjectPublicKeyInfo				tlv
 BEGIN subjectPublicKeyInfo
 DEFINE	algorithm					group ref=OID-Tree,is_pair
-DEFINE	subjectPublicKey				octets der_type=bitstring
+DEFINE	subjectPublicKey				bitstring
 END subjectPublicKeyInfo
 
 DEFINE	extensions					x509_extensions ref=OID-Tree
@@ -48,5 +48,5 @@ END tbsCertificate
 
 DEFINE	signatureAlgorithm				group ref=OID-Tree,is_pair
 
-DEFINE	signature					octets der_type=bitstring
+DEFINE	signature					bitstring
 END Certificate