Merge branch 'tmp-restore-size' into 'master'
SIZE: restore handling of SIZE nodes
See merge request gnutls/libtasn1!68
diff --git a/lib/ASN1.y b/lib/ASN1.y
index c63b40f..f6b7bc7 100644
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -252,9 +252,12 @@
| GeneralizedTime {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_GENERALIZED_TIME);}
;
-size_def2: SIZE'('num_identifier')' { }
+size_def2: SIZE'('num_identifier')' {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SIZE|CONST_1_PARAM);
+ _asn1_set_value($$,$3,strlen($3)+1);}
| SIZE'('num_identifier'.''.'num_identifier')'
- { }
+ {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SIZE|CONST_MIN_MAX);
+ _asn1_set_value($$,$3,strlen($3)+1);
+ _asn1_set_name($$,$6);}
;
size_def: size_def2 {$$=$1;}
@@ -262,43 +265,53 @@
;
generalstring_def: GeneralString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_GENERALSTRING);}
- | GeneralString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_GENERALSTRING|CONST_SIZE);}
+ | GeneralString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_GENERALSTRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
numericstring_def: NumericString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_NUMERIC_STRING|CONST_UNIVERSAL);}
- | NumericString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_NUMERIC_STRING|CONST_SIZE);}
+ | NumericString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_NUMERIC_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
ia5string_def: IA5String {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_IA5_STRING);}
- | IA5String size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_IA5_STRING|CONST_SIZE);}
+ | IA5String size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_IA5_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
teletexstring_def: TeletexString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_TELETEX_STRING);}
- | TeletexString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_TELETEX_STRING|CONST_SIZE);}
+ | TeletexString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_TELETEX_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
printablestring_def: PrintableString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_PRINTABLE_STRING);}
- | PrintableString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_PRINTABLE_STRING|CONST_SIZE);}
+ | PrintableString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_PRINTABLE_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
universalstring_def: UniversalString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UNIVERSAL_STRING);}
- | UniversalString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UNIVERSAL_STRING|CONST_SIZE);}
+ | UniversalString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UNIVERSAL_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
bmpstring_def: BMPString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BMP_STRING);}
- | BMPString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BMP_STRING|CONST_SIZE);}
+ | BMPString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BMP_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
utf8string_def: UTF8String {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UTF8_STRING);}
- | UTF8String size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UTF8_STRING|CONST_SIZE);}
+ | UTF8String size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_UTF8_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
visiblestring_def: VisibleString {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_VISIBLE_STRING);}
- | VisibleString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_VISIBLE_STRING|CONST_SIZE);}
+ | VisibleString size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_VISIBLE_STRING|CONST_SIZE);
+ _asn1_set_down($$,$2);}
;
octet_string_def : OCTET STRING {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_OCTET_STRING);}
- | OCTET STRING size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_OCTET_STRING|CONST_SIZE);}
+ | OCTET STRING size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_OCTET_STRING|CONST_SIZE);
+ _asn1_set_down($$,$3);}
;
bit_element : IDENTIFIER'('NUM')' {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_CONSTANT);
@@ -312,7 +325,8 @@
;
bit_string_def : BIT STRING {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BIT_STRING);}
- | BIT STRING size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BIT_STRING|CONST_SIZE);}
+ | BIT STRING size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BIT_STRING|CONST_SIZE);
+ _asn1_set_down($$,$3);}
| BIT STRING'{'bit_element_list'}'
{$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_BIT_STRING|CONST_LIST);
_asn1_set_down($$,$4);}
@@ -330,7 +344,8 @@
type_assig_right: IDENTIFIER {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_IDENTIFIER);
_asn1_set_value($$,$1,strlen($1)+1);}
| IDENTIFIER size_def {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_IDENTIFIER|CONST_SIZE);
- _asn1_set_value($$,$1,strlen($1)+1);}
+ _asn1_set_value($$,$1,strlen($1)+1);
+ _asn1_set_down($$,$2);}
| integer_def {$$=$1;}
| enumerated_def {$$=$1;}
| boolean_def {$$=$1;}
@@ -380,7 +395,8 @@
| SEQUENCE OF type_assig_right {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SEQUENCE_OF);
_asn1_set_down($$,$3);}
| SEQUENCE size_def OF type_assig_right {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SEQUENCE_OF|CONST_SIZE);
- _asn1_set_down($$,$4);}
+ _asn1_set_right($2,$4);
+ _asn1_set_down($$,$2);}
;
set_def : SET'{'type_assig_list'}' {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SET);
@@ -388,7 +404,8 @@
| SET OF type_assig_right {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SET_OF);
_asn1_set_down($$,$3);}
| SET size_def OF type_assig_right {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_SET_OF|CONST_SIZE);
- _asn1_set_down($$,$4);}
+ _asn1_set_right($2,$4);
+ _asn1_set_down($$,$2);}
;
choise_def : CHOICE'{'type_assig_list'}' {$$=_asn1_add_static_node(&e_list, ASN1_ETYPE_CHOICE);
diff --git a/tests/pkix.asn.out b/tests/pkix.asn.out
index 1cfac71..fc258a6 100644
--- a/tests/pkix.asn.out
+++ b/tests/pkix.asn.out
@@ -51,10 +51,12 @@
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "32"},
{ "CertificatePolicies", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "PolicyInformation"},
{ "PolicyInformation", 1610612741, NULL },
{ "policyIdentifier", 1073741826, "CertPolicyId"},
{ "policyQualifiers", 538984459, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "PolicyQualifierInfo"},
{ "CertPolicyId", 1073741836, NULL },
{ "PolicyQualifierInfo", 1610612741, NULL },
@@ -71,28 +73,39 @@
{ "noticeNumbers", 536870923, NULL },
{ NULL, 3, NULL },
{ "DisplayText", 1610612754, NULL },
- { "visibleString", 1075839011, NULL },
- { "bmpString", 1075839009, NULL },
- { "utf8String", 2097186, NULL },
+ { "visibleString", 1612709923, NULL },
+ { "200", 524298, "1"},
+ { "bmpString", 1612709921, NULL },
+ { "200", 524298, "1"},
+ { "utf8String", 538968098, NULL },
+ { "200", 524298, "1"},
{ "id-ce-policyMappings", 1879048204, NULL },
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "33"},
{ "PolicyMappings", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 536870917, NULL },
{ "issuerDomainPolicy", 1073741826, "CertPolicyId"},
{ "subjectDomainPolicy", 2, "CertPolicyId"},
{ "DirectoryString", 1610612754, NULL },
- { "teletexString", 1075839006, NULL },
- { "printableString", 1075839007, NULL },
- { "universalString", 1075839008, NULL },
- { "utf8String", 1075839010, NULL },
- { "bmpString", 1075839009, NULL },
- { "ia5String", 2097181, NULL },
+ { "teletexString", 1612709918, NULL },
+ { "MAX", 524298, "1"},
+ { "printableString", 1612709919, NULL },
+ { "MAX", 524298, "1"},
+ { "universalString", 1612709920, NULL },
+ { "MAX", 524298, "1"},
+ { "utf8String", 1612709922, NULL },
+ { "MAX", 524298, "1"},
+ { "bmpString", 1612709921, NULL },
+ { "MAX", 524298, "1"},
+ { "ia5String", 538968093, NULL },
+ { "MAX", 524298, "1"},
{ "id-ce-subjectAltName", 1879048204, NULL },
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "17"},
{ "SubjectAltName", 1073741826, "GeneralNames"},
{ "GeneralNames", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "GeneralName"},
{ "GeneralName", 1610612754, NULL },
{ "otherName", 1610620930, "AnotherName"},
@@ -131,6 +144,7 @@
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "9"},
{ "SubjectDirectoryAttributes", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "Attribute"},
{ "id-ce-basicConstraints", 1879048204, NULL },
{ NULL, 1073741825, "id-ce"},
@@ -148,6 +162,7 @@
{ "excludedSubtrees", 536895490, "GeneralSubtrees"},
{ NULL, 4104, "1"},
{ "GeneralSubtrees", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "GeneralSubtree"},
{ "GeneralSubtree", 1610612741, NULL },
{ "base", 1073741826, "GeneralName"},
@@ -170,6 +185,7 @@
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "31"},
{ "CRLDistributionPoints", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "DistributionPoint"},
{ "DistributionPoint", 1610612741, NULL },
{ "distributionPoint", 1610637314, "DistributionPointName"},
@@ -197,6 +213,7 @@
{ NULL, 1073741825, "id-ce"},
{ NULL, 1, "37"},
{ "ExtKeyUsageSyntax", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "KeyPurposeId"},
{ "KeyPurposeId", 1073741836, NULL },
{ "id-kp-serverAuth", 1879048204, NULL },
@@ -227,6 +244,7 @@
{ NULL, 1073741825, "id-pe"},
{ NULL, 1, "1"},
{ "AuthorityInfoAccessSyntax", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "AccessDescription"},
{ "AccessDescription", 1610612741, NULL },
{ "accessMethod", 1073741836, NULL },
@@ -396,7 +414,8 @@
{ "id-at-countryName", 1880096780, "AttributeType"},
{ NULL, 1073741825, "id-at"},
{ NULL, 1, "6"},
- { "X520countryName", 1075839007, NULL },
+ { "X520countryName", 1612709919, NULL },
+ { NULL, 1048586, "2"},
{ "id-at-serialNumber", 1880096780, "AttributeType"},
{ NULL, 1073741825, "id-at"},
{ NULL, 1, "5"},
@@ -439,13 +458,15 @@
{ "emailAddress", 1880096780, "AttributeType"},
{ NULL, 1073741825, "pkcs-9"},
{ NULL, 1, "1"},
- { "Pkcs9email", 1075839005, NULL },
+ { "Pkcs9email", 1612709917, NULL },
+ { "ub-emailaddress-length", 524298, "1"},
{ "Name", 1610612754, NULL },
{ "rdnSequence", 2, "RDNSequence"},
{ "RDNSequence", 1610612747, NULL },
{ NULL, 2, "RelativeDistinguishedName"},
{ "DistinguishedName", 1073741826, "RDNSequence"},
{ "RelativeDistinguishedName", 1612709903, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "AttributeTypeAndValue"},
{ "Certificate", 1610612741, NULL },
{ "tbsCertificate", 1073741826, "TBSCertificate"},
@@ -483,6 +504,7 @@
{ "algorithm", 1073741826, "AlgorithmIdentifier"},
{ "subjectPublicKey", 6, NULL },
{ "Extensions", 1612709899, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "Extension"},
{ "Extension", 1610612741, NULL },
{ "extnID", 1073741836, NULL },
@@ -585,38 +607,58 @@
{ NULL, 2056, "6"},
{ "CountryName", 1610620946, NULL },
{ NULL, 1073746952, "1"},
- { "x121-dcc-code", 1075839004, NULL },
- { "iso-3166-alpha2-code", 2097183, NULL },
+ { "x121-dcc-code", 1612709916, NULL },
+ { NULL, 1048586, "ub-country-name-numeric-length"},
+ { "iso-3166-alpha2-code", 538968095, NULL },
+ { NULL, 1048586, "ub-country-name-alpha-length"},
{ "AdministrationDomainName", 1610620946, NULL },
{ NULL, 1073744904, "2"},
- { "numeric", 1075839004, NULL },
- { "printable", 2097183, NULL },
+ { "numeric", 1612709916, NULL },
+ { "ub-domain-name-length", 524298, "0"},
+ { "printable", 538968095, NULL },
+ { "ub-domain-name-length", 524298, "0"},
{ "NetworkAddress", 1073741826, "X121Address"},
- { "X121Address", 1075839004, NULL },
- { "TerminalIdentifier", 1075839007, NULL },
+ { "X121Address", 1612709916, NULL },
+ { "ub-x121-address-length", 524298, "1"},
+ { "TerminalIdentifier", 1612709919, NULL },
+ { "ub-terminal-id-length", 524298, "1"},
{ "PrivateDomainName", 1610612754, NULL },
- { "numeric", 1075839004, NULL },
- { "printable", 2097183, NULL },
- { "OrganizationName", 1075839007, NULL },
- { "NumericUserIdentifier", 1075839004, NULL },
+ { "numeric", 1612709916, NULL },
+ { "ub-domain-name-length", 524298, "1"},
+ { "printable", 538968095, NULL },
+ { "ub-domain-name-length", 524298, "1"},
+ { "OrganizationName", 1612709919, NULL },
+ { "ub-organization-name-length", 524298, "1"},
+ { "NumericUserIdentifier", 1612709916, NULL },
+ { "ub-numeric-user-id-length", 524298, "1"},
{ "PersonalName", 1610612750, NULL },
{ "surname", 1814044703, NULL },
- { NULL, 4104, "0"},
+ { NULL, 1073745928, "0"},
+ { "ub-surname-length", 524298, "1"},
{ "given-name", 1814061087, NULL },
- { NULL, 4104, "1"},
+ { NULL, 1073745928, "1"},
+ { "ub-given-name-length", 524298, "1"},
{ "initials", 1814061087, NULL },
- { NULL, 4104, "2"},
+ { NULL, 1073745928, "2"},
+ { "ub-initials-length", 524298, "1"},
{ "generation-qualifier", 740319263, NULL },
- { NULL, 4104, "3"},
+ { NULL, 1073745928, "3"},
+ { "ub-generation-qualifier-length", 524298, "1"},
{ "OrganizationalUnitNames", 1612709899, NULL },
+ { "ub-organizational-units", 1074266122, "1"},
{ NULL, 2, "OrganizationalUnitName"},
- { "OrganizationalUnitName", 1075839007, NULL },
+ { "OrganizationalUnitName", 1612709919, NULL },
+ { "ub-organizational-unit-name-length", 524298, "1"},
{ "BuiltInDomainDefinedAttributes", 1612709899, NULL },
+ { "ub-domain-defined-attributes", 1074266122, "1"},
{ NULL, 2, "BuiltInDomainDefinedAttribute"},
{ "BuiltInDomainDefinedAttribute", 1610612741, NULL },
- { "type", 1075839007, NULL },
- { "value", 2097183, NULL },
+ { "type", 1612709919, NULL },
+ { "ub-domain-defined-attribute-type-length", 524298, "1"},
+ { "value", 538968095, NULL },
+ { "ub-domain-defined-attribute-value-length", 524298, "1"},
{ "ExtensionAttributes", 1612709903, NULL },
+ { "ub-extension-attributes", 1074266122, "1"},
{ NULL, 2, "ExtensionAttribute"},
{ "ExtensionAttribute", 1610612741, NULL },
{ "extension-attribute-type", 1610620931, NULL },
@@ -625,35 +667,49 @@
{ NULL, 1073743880, "1"},
{ "extension-attribute-type", 1, NULL },
{ "common-name", 1342177283, "1"},
- { "CommonName", 1075839007, NULL },
+ { "CommonName", 1612709919, NULL },
+ { "ub-common-name-length", 524298, "1"},
{ "teletex-common-name", 1342177283, "2"},
- { "TeletexCommonName", 1075839006, NULL },
+ { "TeletexCommonName", 1612709918, NULL },
+ { "ub-common-name-length", 524298, "1"},
{ "teletex-organization-name", 1342177283, "3"},
- { "TeletexOrganizationName", 1075839006, NULL },
+ { "TeletexOrganizationName", 1612709918, NULL },
+ { "ub-organization-name-length", 524298, "1"},
{ "teletex-personal-name", 1342177283, "4"},
{ "TeletexPersonalName", 1610612750, NULL },
{ "surname", 1814044702, NULL },
- { NULL, 2056, "0"},
+ { NULL, 1073743880, "0"},
+ { "ub-surname-length", 524298, "1"},
{ "given-name", 1814061086, NULL },
- { NULL, 2056, "1"},
+ { NULL, 1073743880, "1"},
+ { "ub-given-name-length", 524298, "1"},
{ "initials", 1814061086, NULL },
- { NULL, 2056, "2"},
+ { NULL, 1073743880, "2"},
+ { "ub-initials-length", 524298, "1"},
{ "generation-qualifier", 740319262, NULL },
- { NULL, 2056, "3"},
+ { NULL, 1073743880, "3"},
+ { "ub-generation-qualifier-length", 524298, "1"},
{ "teletex-organizational-unit-names", 1342177283, "5"},
{ "TeletexOrganizationalUnitNames", 1612709899, NULL },
+ { "ub-organizational-units", 1074266122, "1"},
{ NULL, 2, "TeletexOrganizationalUnitName"},
- { "TeletexOrganizationalUnitName", 1075839006, NULL },
+ { "TeletexOrganizationalUnitName", 1612709918, NULL },
+ { "ub-organizational-unit-name-length", 524298, "1"},
{ "pds-name", 1342177283, "7"},
- { "PDSName", 1075839007, NULL },
+ { "PDSName", 1612709919, NULL },
+ { "ub-pds-name-length", 524298, "1"},
{ "physical-delivery-country-name", 1342177283, "8"},
{ "PhysicalDeliveryCountryName", 1610612754, NULL },
- { "x121-dcc-code", 1075839004, NULL },
- { "iso-3166-alpha2-code", 2097183, NULL },
+ { "x121-dcc-code", 1612709916, NULL },
+ { NULL, 1048586, "ub-country-name-numeric-length"},
+ { "iso-3166-alpha2-code", 538968095, NULL },
+ { NULL, 1048586, "ub-country-name-alpha-length"},
{ "postal-code", 1342177283, "9"},
{ "PostalCode", 1610612754, NULL },
- { "numeric-code", 1075839004, NULL },
- { "printable-code", 2097183, NULL },
+ { "numeric-code", 1612709916, NULL },
+ { "ub-postal-code-length", 524298, "1"},
+ { "printable-code", 538968095, NULL },
+ { "ub-postal-code-length", 524298, "1"},
{ "physical-delivery-office-name", 1342177283, "10"},
{ "PhysicalDeliveryOfficeName", 1073741826, "PDSParameter"},
{ "physical-delivery-office-number", 1342177283, "11"},
@@ -669,8 +725,11 @@
{ "unformatted-postal-address", 1342177283, "16"},
{ "UnformattedPostalAddress", 1610612750, NULL },
{ "printable-address", 1814052875, NULL },
- { NULL, 2097183, NULL },
- { "teletex-string", 203440158, NULL },
+ { "ub-pds-physical-address-lines", 1074266122, "1"},
+ { NULL, 538968095, NULL },
+ { "ub-pds-parameter-length", 524298, "1"},
+ { "teletex-string", 740311070, NULL },
+ { "ub-unformatted-address-length", 524298, "1"},
{ "street-address", 1342177283, "17"},
{ "StreetAddress", 1073741826, "PDSParameter"},
{ "post-office-box-address", 1342177283, "18"},
@@ -682,15 +741,19 @@
{ "local-postal-attributes", 1342177283, "21"},
{ "LocalPostalAttributes", 1073741826, "PDSParameter"},
{ "PDSParameter", 1610612750, NULL },
- { "printable-string", 1277181983, NULL },
- { "teletex-string", 203440158, NULL },
+ { "printable-string", 1814052895, NULL },
+ { "ub-pds-parameter-length", 524298, "1"},
+ { "teletex-string", 740311070, NULL },
+ { "ub-pds-parameter-length", 524298, "1"},
{ "extended-network-address", 1342177283, "22"},
{ "ExtendedNetworkAddress", 1610612754, NULL },
{ "e163-4-address", 1610612741, NULL },
{ "number", 1612718108, NULL },
- { NULL, 2056, "0"},
+ { NULL, 1073743880, "0"},
+ { "ub-e163-4-number-length", 524298, "1"},
{ "sub-address", 538992668, NULL },
- { NULL, 2056, "1"},
+ { NULL, 1073743880, "1"},
+ { "ub-e163-4-sub-address-length", 524298, "1"},
{ "psap-address", 536879106, "PresentationAddress"},
{ NULL, 2056, "0"},
{ "PresentationAddress", 1610612741, NULL },
@@ -702,6 +765,7 @@
{ NULL, 2056, "2"},
{ "nAddresses", 538976271, NULL },
{ NULL, 1073743880, "3"},
+ { "MAX", 1074266122, "1"},
{ NULL, 7, NULL },
{ "terminal-type", 1342177283, "23"},
{ "TerminalType", 1610874883, NULL },
@@ -713,10 +777,13 @@
{ "videotex", 1, "8"},
{ "teletex-domain-defined-attributes", 1342177283, "6"},
{ "TeletexDomainDefinedAttributes", 1612709899, NULL },
+ { "ub-domain-defined-attributes", 1074266122, "1"},
{ NULL, 2, "TeletexDomainDefinedAttribute"},
{ "TeletexDomainDefinedAttribute", 1610612741, NULL },
- { "type", 1075839006, NULL },
- { "value", 2097182, NULL },
+ { "type", 1612709918, NULL },
+ { "ub-domain-defined-attribute-type-length", 524298, "1"},
+ { "value", 538968094, NULL },
+ { "ub-domain-defined-attribute-value-length", 524298, "1"},
{ "ub-name", 1342177283, "32768"},
{ "ub-common-name", 1342177283, "64"},
{ "ub-locality-name", 1342177283, "128"},
@@ -795,6 +862,7 @@
{ "unsignedAttrs", 536895490, "SignedAttributes"},
{ NULL, 4104, "1"},
{ "SignedAttributes", 1612709903, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "Attribute"},
{ "SignerIdentifier", 1610612754, NULL },
{ "issuerAndSerialNumber", 1073741826, "IssuerAndSerialNumber"},
@@ -826,8 +894,10 @@
{ NULL, 1073741825, "pkcs-9"},
{ NULL, 1, "7"},
{ "pkcs-9-challengePassword", 1610612754, NULL },
- { "printableString", 1075839007, NULL },
- { "utf8String", 2097186, NULL },
+ { "printableString", 1612709919, NULL },
+ { "pkcs-9-ub-challengePassword", 524298, "1"},
+ { "utf8String", 538968098, NULL },
+ { "pkcs-9-ub-challengePassword", 524298, "1"},
{ "pkcs-9-at-localKeyId", 1879048204, NULL },
{ NULL, 1073741825, "pkcs-9"},
{ NULL, 1, "21"},
@@ -835,7 +905,8 @@
{ "pkcs-9-at-friendlyName", 1879048204, NULL },
{ NULL, 1073741825, "pkcs-9"},
{ NULL, 1, "20"},
- { "pkcs-9-friendlyName", 1075839009, NULL },
+ { "pkcs-9-friendlyName", 1612709921, NULL },
+ { "255", 524298, "1"},
{ "pkcs-8-PrivateKeyInfo", 1610612741, NULL },
{ "version", 1073741826, "pkcs-8-Version"},
{ "privateKeyAlgorithm", 1073741826, "AlgorithmIdentifier"},
@@ -863,7 +934,8 @@
{ "pkcs-5-des-EDE3-CBC", 1879048204, NULL },
{ NULL, 1073741825, "pkcs-5-encryptionAlgorithm"},
{ NULL, 1, "7"},
- { "pkcs-5-des-EDE3-CBC-params", 1075838983, NULL },
+ { "pkcs-5-des-EDE3-CBC-params", 1612709895, NULL },
+ { NULL, 1048586, "8"},
{ "pkcs-5-id-PBES2", 1879048204, NULL },
{ NULL, 1073741825, "pkcs-5"},
{ NULL, 1, "13"},
@@ -949,6 +1021,7 @@
{ NULL, 4104, "0"},
{ "pkcs-7-ContentEncryptionAlgorithmIdentifier", 1073741826, "AlgorithmIdentifier"},
{ "pkcs-7-UnprotectedAttributes", 1612709903, NULL },
+ { "MAX", 1074266122, "1"},
{ NULL, 2, "Attribute"},
{ "id-at-ldap-DC", 1880096780, "AttributeType"},
{ NULL, 1073741825, "0"},
@@ -982,15 +1055,18 @@
{ "id-pda-gender", 1880096780, "AttributeType"},
{ NULL, 1073741825, "id-pda"},
{ NULL, 1, "3"},
- { "Gender", 1075839007, NULL },
+ { "Gender", 1612709919, NULL },
+ { NULL, 1048586, "1"},
{ "id-pda-countryOfCitizenship", 1880096780, "AttributeType"},
{ NULL, 1073741825, "id-pda"},
{ NULL, 1, "4"},
- { "CountryOfCitizenship", 1075839007, NULL },
+ { "CountryOfCitizenship", 1612709919, NULL },
+ { NULL, 1048586, "2"},
{ "id-pda-countryOfResidence", 1880096780, "AttributeType"},
{ NULL, 1073741825, "id-pda"},
{ NULL, 1, "5"},
- { "CountryOfResidence", 1075839007, NULL },
+ { "CountryOfResidence", 1612709919, NULL },
+ { NULL, 1048586, "2"},
{ "id-pe-proxyCertInfo", 1879048204, NULL },
{ NULL, 1073741825, "id-pe"},
{ NULL, 1, "14"},
