diff options
| author | pascal <pascal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-07-17 19:43:17 +0000 |
|---|---|---|
| committer | pascal <pascal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-07-17 19:43:17 +0000 |
| commit | cdee3d58c265417077585c8e72a38a94abda0aa0 (patch) | |
| tree | 9a979e13471a466a5b618fe61e38a774b240a819 /asn1 | |
| parent | 66d8cf177e48208c8412eb7d4d6e921031ea4515 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7470 :
Add support for OID 1.3.6.1.5.2.2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43771 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkinit/PKINIT.asn | 12 | ||||
| -rw-r--r-- | asn1/pkinit/packet-pkinit-template.c | 14 | ||||
| -rw-r--r-- | asn1/pkinit/pkinit.cnf | 5 |
3 files changed, 22 insertions, 9 deletions
diff --git a/asn1/pkinit/PKINIT.asn b/asn1/pkinit/PKINIT.asn index b8fed67b45..2af0321a84 100644 --- a/asn1/pkinit/PKINIT.asn +++ b/asn1/pkinit/PKINIT.asn @@ -23,9 +23,7 @@ KerberosV5-PK-INIT-SPEC { iso(1) identified-organization(3) dod(6) internet(1) - security(5) kerberosV5(2) modules(4) pkinit(0) } --- security(5) kerberosV5(2) modules(4) pkinit(TBD) } --- TBD makes the asn2wrs compiler upset + security(5) kerberosV5(2) modules(4) pkinit(5) } DEFINITIONS EXPLICIT TAGS ::= BEGIN @@ -114,10 +112,10 @@ PKAuthenticator ::= SEQUENCE { -- CertificateIndex ::= IssuerAndSerialNumber -- -- --- KRB5PrincipalName ::= SEQUENCE { --- realm [0] Realm, --- principalName [1] PrincipalName --- } +KRB5PrincipalName ::= SEQUENCE { + realm [0] Realm, + principalName [1] PrincipalName +} -- -- -- InitialVerifiedCAs ::= SEQUENCE OF SEQUENCE { diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c index b662ff0506..aaddf318e3 100644 --- a/asn1/pkinit/packet-pkinit-template.c +++ b/asn1/pkinit/packet-pkinit-template.c @@ -50,6 +50,8 @@ static int proto_pkinit = -1; static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); +static int dissect_KerberosV5Spec2_Realm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); +static int dissect_KerberosV5Spec2_PrincipalName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); #include "packet-pkinit-fn.c" @@ -77,6 +79,18 @@ dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } +static int +dissect_KerberosV5Spec2_Realm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) { + offset = dissect_krb5_realm(tree, tvb, offset, actx); + return offset; +} + +static int +dissect_KerberosV5Spec2_PrincipalName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) { + offset = dissect_krb5_cname(tree, tvb, offset, actx); + return offset; +} + /*--- proto_register_pkinit ----------------------------------------------*/ void proto_register_pkinit(void) { diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf index 63ce6b006e..a811872944 100644 --- a/asn1/pkinit/pkinit.cnf +++ b/asn1/pkinit/pkinit.cnf @@ -14,8 +14,9 @@ PaPkAsReq PaPkAsRep #.REGISTER -AuthPack B "1.3.6.1.5.2.3.1" "id-pkauthdata" -KDCDHKeyInfo B "1.3.6.1.5.2.3.2" "id-pkdhkeydata" +AuthPack B "1.3.6.1.5.2.3.1" "id-pkauthdata" +KDCDHKeyInfo B "1.3.6.1.5.2.3.2" "id-pkdhkeydata" +KRB5PrincipalName B "1.3.6.1.5.2.2" "id-pkinit-san" #.NO_EMIT |