diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-10 21:22:29 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-10 21:22:29 +0000 |
| commit | 633e4e324baa14c895862750aeeaec72e71900d2 (patch) | |
| tree | 392121db710e0aa9131f09044beef70a16b87a9a /asn1 | |
| parent | 8d8c3978522637dacfa7b3569db69ac35f28ae7d (diff) | |
From Martin Peylo via bug 5198:
Added missing OIDs in CRMF (RFC 4211) dissector.
svn path=/trunk/; revision=34099
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/crmf/crmf.cnf | 8 | ||||
| -rw-r--r-- | asn1/crmf/packet-crmf-template.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf index 3b28ba8b94..f5abc415dc 100644 --- a/asn1/crmf/crmf.cnf +++ b/asn1/crmf/crmf.cnf @@ -45,12 +45,16 @@ SubsequentMessage UTF8Pairs #.REGISTER -CertId B "1.3.6.1.5.5.7.5.1.5" "id-regCtrl-oldCertID" -CertRequest B "1.3.6.1.5.5.7.5.2.2" "id-regInfo-certReq" EncKeyWithID B "1.2.840.113549.1.9.16.1.21" "id-ct-encKeyWithID" PBMParameter B "1.2.840.113533.7.66.13" "PasswordBasedMac" +RegToken B "1.3.6.1.5.5.7.5.1.1" "id-regCtrl-regToken" +Authenticator B "1.3.6.1.5.5.7.5.1.2" "id-regCtrl-authenticator" +PKIPublicationInfo B "1.3.6.1.5.5.7.5.1.3" "id-regCtrl-pkiPublicationInfo" +PKIArchiveOptions B "1.3.6.1.5.5.7.5.1.4" "id-regCtrl-pkiArchiveOptions" +OldCertId B "1.3.6.1.5.5.7.5.1.5" "id-regCtrl-oldCertID" ProtocolEncrKey B "1.3.6.1.5.5.7.5.1.6" "id-regCtrl-protocolEncrKey" UTF8Pairs B "1.3.6.1.5.5.7.5.2.1" "id-regInfo-utf8Pairs" +CertRequest B "1.3.6.1.5.5.7.5.2.2" "id-regInfo-certReq" #.NO_EMIT diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c index e4ea0acc98..9f9911a733 100644 --- a/asn1/crmf/packet-crmf-template.c +++ b/asn1/crmf/packet-crmf-template.c @@ -29,6 +29,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/oids.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -83,6 +84,9 @@ void proto_register_crmf(void) { /*--- proto_reg_handoff_crmf -------------------------------------------*/ void proto_reg_handoff_crmf(void) { + oid_add_from_string("id-pkip","1.3.6.1.5.5.7.5"); + oid_add_from_string("id-regCtrl","1.3.6.1.5.5.7.5.1"); + oid_add_from_string("id-regInfo","1.3.6.1.5.5.7.5.2"); #include "packet-crmf-dis-tab.c" } |