diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-03-25 17:10:07 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-03-25 17:10:07 +0000 |
| commit | 4dd0ac18bcc1c0fece816290c24f821f0830fccb (patch) | |
| tree | 4cdfff99eb974c6f0e86fbd99c68dd789ca6f41b /asn1 | |
| parent | c51f4fa88754bd12d437e4c9a30e2460bdbd9912 (diff) | |
Support for otherName and x400address in a GeneralName
svn path=/trunk/; revision=17728
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/x509ce/CertificateExtensions.asn | 12 | ||||
| -rw-r--r-- | asn1/x509ce/packet-x509ce-template.c | 1 | ||||
| -rw-r--r-- | asn1/x509ce/x509ce-exp.cnf | 2 | ||||
| -rw-r--r-- | asn1/x509ce/x509ce.cnf | 8 |
4 files changed, 20 insertions, 3 deletions
diff --git a/asn1/x509ce/CertificateExtensions.asn b/asn1/x509ce/CertificateExtensions.asn index ac02f96a48..50e8f2a54f 100644 --- a/asn1/x509ce/CertificateExtensions.asn +++ b/asn1/x509ce/CertificateExtensions.asn @@ -146,10 +146,10 @@ PolicyMappingsSyntax ::= GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName GeneralName ::= CHOICE { --- otherName [0] IMPLICIT INSTANCE OF OTHER-NAME, + otherName [0] IMPLICIT --INSTANCE OF OTHER-NAME-- OtherName, rfc822Name [1] IMPLICIT IA5String, dNSName [2] IMPLICIT IA5String, --- x400Address [3] IMPLICIT ORAddress, + x400Address [3] IMPLICIT ORAddress, directoryName [4] IMPLICIT Name, ediPartyName [5] IMPLICIT EDIPartyName, uniformResourceIdentifier [6] IMPLICIT IA5String, @@ -159,6 +159,14 @@ GeneralName ::= CHOICE { -- OTHER-NAME ::= TYPE-IDENTIFIER +OtherName ::= SEQUENCE { + type-id OtherNameType, + value [0] EXPLICIT OtherNameValue +} + +OtherNameType ::= OBJECT IDENTIFIER +OtherNameValue ::= ANY + EDIPartyName ::= SEQUENCE { nameAssigner [0] IMPLICIT DirectoryString OPTIONAL, partyName [1] IMPLICIT DirectoryString diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index d5928ceba9..0baa188994 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -39,6 +39,7 @@ #include "packet-x509af.h" #include "packet-x509if.h" #include "packet-x509sat.h" +#include "packet-x411.h" #define PNAME "X.509 Certificate Extensions" #define PSNAME "X509CE" diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf index 6d3861a563..50de440a24 100644 --- a/asn1/x509ce/x509ce-exp.cnf +++ b/asn1/x509ce/x509ce-exp.cnf @@ -73,7 +73,7 @@ BasicConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL NameConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 GeneralSubtrees TYPE = FT_UINT32 DISPLAY = BASE_DEC 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 +BaseDistance TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 PolicyConstraintsSyntax TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SkipCerts TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 CRLNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index edce713b94..45242c4f1f 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -7,10 +7,12 @@ InformationFramework x509if AuthenticationFramework x509af SelectedAttributeTypes x509sat +MTSAbstractService x411 #.INCLUDE ../x509if/x509if-exp.cnf #.INCLUDE ../x509af/x509af-exp.cnf #.INCLUDE ../x509sat/x509sat-exp.cnf +#.INCLUDE ../x411/x411-exp.cnf #.EXPORTS AltNameType @@ -114,6 +116,12 @@ CertificatePairExactAssertion/issuedByThisCAAssertion cpea_issuedByThisCAAsserti proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, FALSE); offset+=4; +#.FN_PARS OtherNameType + FN_VARIANT = _str VAL_PTR = &object_identifier_id + +#.FN_BODY OtherNameValue + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + #.END |