diff options
Diffstat (limited to 'asn1')
-rwxr-xr-x | asn1/MAP_Dialogue/Makefile | 5 | ||||
-rwxr-xr-x | asn1/cmip/Makefile | 5 | ||||
-rw-r--r-- | asn1/cmip/cmip.cnf | 8 | ||||
-rw-r--r-- | asn1/cms/cms-exp.cnf | 8 | ||||
-rw-r--r-- | asn1/gsmmap/packet-gsm_map-template.c | 4 | ||||
-rw-r--r-- | asn1/h248/packet-h248-template.c | 4 | ||||
-rwxr-xr-x | asn1/pkcs1/Makefile | 4 | ||||
-rwxr-xr-x | asn1/pkinit/Makefile | 5 | ||||
-rwxr-xr-x | asn1/pkix1explicit/Makefile | 5 | ||||
-rwxr-xr-x | asn1/pkix1implicit/Makefile | 5 | ||||
-rwxr-xr-x | asn1/pkixqualified/Makefile | 5 | ||||
-rw-r--r-- | asn1/x509af/x509af-exp.cnf | 6 | ||||
-rw-r--r-- | asn1/x509ce/x509ce-exp.cnf | 20 | ||||
-rw-r--r-- | asn1/x509if/x509if-exp.cnf | 8 | ||||
-rw-r--r-- | asn1/x509sat/x509sat-exp.cnf | 12 |
15 files changed, 69 insertions, 35 deletions
diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile new file mode 100755 index 0000000000..d1bf03a00b --- /dev/null +++ b/asn1/MAP_Dialogue/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-MAP_DialoguePDU.c : ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf + python ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn + cp packet-MAP_DialoguePDU.* ../../epan/dissectors + diff --git a/asn1/cmip/Makefile b/asn1/cmip/Makefile new file mode 100755 index 0000000000..3eb2877e96 --- /dev/null +++ b/asn1/cmip/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-cmip.c : ../../tools/asn2eth.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf + python ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn + cp packet-cmip.* ../../epan/dissectors + diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 90c4893109..3541b21f1a 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -35,14 +35,14 @@ ROS #.FN_BODY CMIPAbortSource guint32 value; - offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value); if(check_col(pinfo->cinfo, COL_INFO)){ col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, CMIPAbortSource_vals, " Unknown AbortSource:%d")); } #.END #.FN_BODY Opcode - offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode); if(check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, Opcode_vals, " Unknown Opcode:%d")); } @@ -83,7 +83,7 @@ ROS #.FN_BODY AttributeId/localForm attributeform = ATTRIBUTE_LOCAL_FORM; - offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL); #.FN_BODY Attribute/value /*XXX handle local form here */ @@ -172,7 +172,7 @@ ROS #.FN_BODY ObjectClass/oclocalForm objectclassform = OBJECTCLASS_LOCAL_FORM; - offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL); #.FN_BODY ActionInfo/actionType offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index 9fbeb1ab7c..aa570b6a91 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -17,13 +17,13 @@ IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ContentType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -DigestAlgorithmIdentifiers TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -SignerInfos TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +DigestAlgorithmIdentifiers TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +SignerInfos TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 EncapsulatedContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignerInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignerIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(SignerIdentifier_vals) BITMASK = 0 -SignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -UnsignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +UnsignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index bf04c386f5..1e894beeb1 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -170,7 +170,7 @@ static guint32 opcode=0; static int dissect_gsm_map_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode); + offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode); if (check_col(pinfo->cinfo, COL_INFO)){ col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, gsm_map_opr_code_strings, "Unknown GSM-MAP (%u)")); @@ -543,7 +543,7 @@ dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse } static int dissect_invokeid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL); + return dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL); } diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 1910a02407..45eeb15561 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -272,7 +272,7 @@ dissect_h248_annex_C_PDU(gboolean implicit_tag, tvbuff_t *tvb, packet_info *pinf dissect_nsap(new_tvb, 0,tvb_length_remaining(new_tvb, 0), tree); break; case 0x9001: /* TMR */ - offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL); + offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL); break; case 0x9023: /* User Service Information */ offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_h248_package_annex_C_USI, &new_tvb); @@ -304,7 +304,7 @@ guint offset=0; proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major); break; case 0x001e: /* Bearer Characteristics Q.1950 Annex A */ - offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL); + offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL); break; case 0x0021: /* Generic Bearer Connection Q.1950 Annex A */ proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major); diff --git a/asn1/pkcs1/Makefile b/asn1/pkcs1/Makefile new file mode 100755 index 0000000000..17a493cf52 --- /dev/null +++ b/asn1/pkcs1/Makefile @@ -0,0 +1,4 @@ +../../epan/dissectors/packet-pkcs1.c : ../../tools/asn2eth.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf + python ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn + cp packet-pkcs1.* ../../epan/dissectors + diff --git a/asn1/pkinit/Makefile b/asn1/pkinit/Makefile new file mode 100755 index 0000000000..50c54b2ac5 --- /dev/null +++ b/asn1/pkinit/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-pkinit.c : ../../tools/asn2eth.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf + python ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn + cp packet-pkinit.* ../../epan/dissectors + diff --git a/asn1/pkix1explicit/Makefile b/asn1/pkix1explicit/Makefile new file mode 100755 index 0000000000..670de30c90 --- /dev/null +++ b/asn1/pkix1explicit/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-pkix1explicit.c : ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf + python ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn + cp packet-pkix1explicit.* ../../epan/dissectors + diff --git a/asn1/pkix1implicit/Makefile b/asn1/pkix1implicit/Makefile new file mode 100755 index 0000000000..e830685e0b --- /dev/null +++ b/asn1/pkix1implicit/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-pkix1implicit.c : ../../tools/asn2eth.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf + python ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn + cp packet-pkix1implicit.* ../../epan/dissectors + diff --git a/asn1/pkixqualified/Makefile b/asn1/pkixqualified/Makefile new file mode 100755 index 0000000000..ed814004cd --- /dev/null +++ b/asn1/pkixqualified/Makefile @@ -0,0 +1,5 @@ + +../../epan/dissectors/packet-pkixqualified.c : ../../tools/asn2eth.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf + python ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn + cp packet-pkixqualified.* ../../epan/dissectors + diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf index 20f16dd83b..5b898fa6de 100644 --- a/asn1/x509af/x509af-exp.cnf +++ b/asn1/x509af/x509af-exp.cnf @@ -31,11 +31,11 @@ AlgorithmIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL Validity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Time_vals) BITMASK = 0 -Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +Extensions TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -ForwardCertificationPath TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CrossCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +ForwardCertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +CrossCertificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificatePair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificateList TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf index 0def4ccb3f..aa51e8c792 100644 --- a/asn1/x509ce/x509ce-exp.cnf +++ b/asn1/x509ce/x509ce-exp.cnf @@ -58,20 +58,20 @@ AuthorityKeyIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL KeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 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 +KeyPurposeIDs TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 KeyPurposeId TYPE = FT_STRING 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 +CertificatePoliciesSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PolicyInformation TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PolicyQualifierInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PolicyMappingsSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -GeneralNames TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +PolicyMappingsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GeneralNames TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 GeneralName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(GeneralName_vals) BITMASK = 0 EDIPartyName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -AttributesSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +AttributesSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 BasicConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 NameConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -GeneralSubtrees TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +GeneralSubtrees TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 GeneralSubtree TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 BaseDistance TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 PolicyConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 @@ -79,19 +79,19 @@ SkipCerts TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL CRLNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 CRLReason TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(CRLReason_vals) BITMASK = 0 HoldInstruction TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CRLScopeSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CRLScopeSyntax TYPE = FT_NONE DISPLAY = BASE_NONE 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 NumberRange TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 BaseRevocationInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -StatusReferrals TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +StatusReferrals TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 StatusReferral TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(StatusReferral_vals) BITMASK = 0 CRLReferral TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DeltaRefInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CRLStreamIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 OrderedListSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(OrderedListSyntax_vals) BITMASK = 0 DeltaInformation TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CRLDistPointsSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CRLDistPointsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DistributionPoint TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DistributionPointName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(DistributionPointName_vals) BITMASK = 0 ReasonFlags TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 @@ -100,7 +100,7 @@ BaseCRLNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL CertificateExactAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificateAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AltNameType TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AltNameType_vals) BITMASK = 0 -CertPolicySet TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +CertPolicySet TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificatePairExactAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificatePairAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertificateListExactAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf index 32b5ffd1c6..448036073a 100644 --- a/asn1/x509if/x509if-exp.cnf +++ b/asn1/x509if/x509if-exp.cnf @@ -48,12 +48,12 @@ AttributeValueAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL ContextAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AttributeTypeAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Name TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Name_vals) BITMASK = 0 -RDNSequence TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -DistinguishedName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -RelativeDistinguishedName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +RDNSequence TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +DistinguishedName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +RelativeDistinguishedName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AttributeTypeAndDistinguishedValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SubtreeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -LocalName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +LocalName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ChopSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 BaseDistance TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 Refinement TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Refinement_vals) BITMASK = 0 diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf index 2cf5a05322..05e01b04b9 100644 --- a/asn1/x509sat/x509sat-exp.cnf +++ b/asn1/x509sat/x509sat-exp.cnf @@ -37,20 +37,20 @@ UniqueIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL CountryName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Criteria TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Criteria_vals) BITMASK = 0 EnhancedGuide TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PostalAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +PostalAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 FacsimileTelephoneNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 X121Address TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 InternationalISDNNumber TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DestinationIndicator TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PreferredDeliveryMethod TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +PreferredDeliveryMethod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PresentationAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ProtocolInformation TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 NameAndOptionalUID TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 MultipleMatchingLocalities TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -SubstringAssertion TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -CaseIgnoreListMatch TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -OctetSubstringAssertion TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -ZonalSelect TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +SubstringAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +CaseIgnoreListMatch TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +OctetSubstringAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ZonalSelect TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ZonalResult TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(ZonalResult_vals) BITMASK = 0 LanguageContextSyntax TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 TimeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 |