diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-12-08 23:29:21 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-12-08 23:29:21 +0000 |
commit | b45d2efe6db49becb5bb1b5b27fbca9948b785c5 (patch) | |
tree | 0e3df38ff6beeed4ad09db532adb3806d30eddea /asn1 | |
parent | a770b7b647b382ea5232be245e38a2433950ad80 (diff) | |
download | wireshark-b45d2efe6db49becb5bb1b5b27fbca9948b785c5.tar.gz wireshark-b45d2efe6db49becb5bb1b5b27fbca9948b785c5.tar.bz2 wireshark-b45d2efe6db49becb5bb1b5b27fbca9948b785c5.zip |
Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/pkixcmp/cmp-exp.cnf | 4 | ||||
-rw-r--r-- | asn1/x509ce/x509ce-exp.cnf | 4 | ||||
-rw-r--r-- | asn1/x509if/x509if-exp.cnf | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf index c5ee310b08..56e13e661f 100644 --- a/asn1/pkixcmp/cmp-exp.cnf +++ b/asn1/pkixcmp/cmp-exp.cnf @@ -44,9 +44,9 @@ PKIFreeText TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL PKIBody TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIBody_vals) BITMASK = 0 PKIProtection TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 ProtectedPart TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PasswordBasedMac TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +PasswordBasedMac TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -DHBasedMac TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +DHBasedMac TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DHBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 NestedMessageContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PKIStatus TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIStatus_vals) BITMASK = 0 diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf index e9748da6de..6d3861a563 100644 --- a/asn1/x509ce/x509ce-exp.cnf +++ b/asn1/x509ce/x509ce-exp.cnf @@ -59,7 +59,7 @@ KeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL SubjectKeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 KeyUsage TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 KeyPurposeIDs TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -KeyPurposeId TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +KeyPurposeId TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PrivateKeyUsagePeriod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificatePoliciesSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 PolicyInformation TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 @@ -78,7 +78,7 @@ PolicyConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL SkipCerts TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 CRLNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 CRLReason TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x509ce_CRLReason_vals) BITMASK = 0 -HoldInstruction TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +HoldInstruction TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CRLScopeSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 PerAuthorityScope TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 OnlyCertificateTypes TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf index bc2429db1f..b68cedbd93 100644 --- a/asn1/x509if/x509if-exp.cnf +++ b/asn1/x509if/x509if-exp.cnf @@ -44,7 +44,7 @@ MRSubstitution BER_CLASS_UNI BER_UNI_TAG_SEQUENCE #.TYPE_ATTR AttributeValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Attribute TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributeType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +AttributeType TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Context TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AttributeValueAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ContextAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 |