From deaf5edaaf4ae2cd785da506bc79452a33b8f1f9 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au>
Date: Thu, 27 Oct 2005 11:54:55 +0000
Subject: register 1.2.840.113533.7.66.13 as passwordbasedmac from CRMF

svn path=/trunk/; revision=16344
---
 asn1/pkixcrmf/crmf.cnf               |  1 +
 asn1/pkixcrmf/packet-crmf-template.c |  2 +-
 epan/dissectors/packet-crmf.c        | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/asn1/pkixcrmf/crmf.cnf b/asn1/pkixcrmf/crmf.cnf
index aa584b433c..3ceb9cadae 100644
--- a/asn1/pkixcrmf/crmf.cnf
+++ b/asn1/pkixcrmf/crmf.cnf
@@ -42,6 +42,7 @@ SubsequentMessage
 UTF8Pairs
 
 #.REGISTER
+PBMParameter         B "1.2.840.113533.7.66.13" "PasswordBasedMac"
 
 #.NO_EMIT
 
diff --git a/asn1/pkixcrmf/packet-crmf-template.c b/asn1/pkixcrmf/packet-crmf-template.c
index 489574e9c4..5f5b8679b3 100644
--- a/asn1/pkixcrmf/packet-crmf-template.c
+++ b/asn1/pkixcrmf/packet-crmf-template.c
@@ -86,6 +86,6 @@ void proto_register_crmf(void) {
 
 /*--- proto_reg_handoff_crmf -------------------------------------------*/
 void proto_reg_handoff_crmf(void) {
-/*#include "packet-crmf-dis-tab.c"*/
+#include "packet-crmf-dis-tab.c"
 }
 
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index cceeccb7b3..01d2ba8dcf 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -57,6 +57,7 @@ static int hf_crmf_type_oid = -1;
 
 /*--- Included file: packet-crmf-hf.c ---*/
 
+static int hf_crmf_PBMParameter_PDU = -1;         /* PBMParameter */
 static int hf_crmf_utcTime = -1;                  /* UTCTime */
 static int hf_crmf_generalTime = -1;              /* GeneralizedTime */
 static int hf_crmf_CertReqMessages_item = -1;     /* CertReqMsg */
@@ -992,6 +993,12 @@ dissect_crmf_CertReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
   return offset;
 }
 
+/*--- PDUs ---*/
+
+static void dissect_PBMParameter_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  dissect_crmf_PBMParameter(FALSE, tvb, 0, pinfo, tree, hf_crmf_PBMParameter_PDU);
+}
+
 
 /*--- End of included file: packet-crmf-fn.c ---*/
 
@@ -1009,6 +1016,10 @@ void proto_register_crmf(void) {
 
 /*--- Included file: packet-crmf-hfarr.c ---*/
 
+    { &hf_crmf_PBMParameter_PDU,
+      { "PBMParameter", "crmf.PBMParameter",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "PBMParameter", HFILL }},
     { &hf_crmf_utcTime,
       { "utcTime", "crmf.utcTime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -1303,6 +1314,13 @@ void proto_register_crmf(void) {
 
 /*--- proto_reg_handoff_crmf -------------------------------------------*/
 void proto_reg_handoff_crmf(void) {
-/*#include "packet-crmf-dis-tab.c"*/
+
+/*--- Included file: packet-crmf-dis-tab.c ---*/
+
+  register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac");
+
+
+/*--- End of included file: packet-crmf-dis-tab.c ---*/
+
 }
 
-- 
cgit v1.2.3