From Martin Peylo:

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1888

There are new versions of CMP (v2) in RFC4210 and CRMF (v2) in RFC4211. The
right to exist of CRMF is bound to CMP so I don't split that into two bug
reports. 

I'll upload the new (slightly handmassaged) ASN.1 files for both protocols,
along with patches for the respective cnf files, where I also added new
#.REGISTER statements.

Additionally I had to export some definitions from pkix1explicit (Attribute,
Time, UniqueIdentifier and Version) and from pkix1implicit (KeyIdentifier).
I'll also upload a patch for that.

I uploaded a CMPv2 sample (with errors in the protocol!) to the wiki.

svn path=/trunk/; revision=23082

6 files changed, 8 insertions, 3 deletions

diff --git a/asn1/pkix1implicit/Makefile b/asn1/pkix1implicit/Makefile
index 4283a3566a..6e11985c59 100644
--- a/asn1/pkix1implicit/Makefile
+++ b/asn1/pkix1implicit/Makefile
@@ -7,7 +7,7 @@ all: generate_dissector
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf
-	python ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn 
+	python ../../tools/asn2wrs.py -e -b -X -T -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn 
 
 clean:
 	rm -f pkix1implicit-exp.cnf parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/pkix1implicit/Makefile.nmake b/asn1/pkix1implicit/Makefile.nmake
index b6718cb304..5ed0f4153d 100644
--- a/asn1/pkix1implicit/Makefile.nmake
+++ b/asn1/pkix1implicit/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf
 !IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -e -b -p $(PROTOCOL_NAME) -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn 
+	$(PYTHON) "../../tools/asn2wrs.py" -e -b -X -T -p $(PROTOCOL_NAME) -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn 
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
index 487bf84f62..075c8773f9 100644
--- a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
+++ b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
@@ -83,7 +83,7 @@ IMPORTS
 --         WITH COMPONENTS        {..., authorityCertIssuer ABSENT,
 --                                authorityCertSerialNumber ABSENT} )
 --
---KeyIdentifier ::= OCTET STRING
+KeyIdentifier ::= OCTET STRING
 --
 --subjectKeyIdentifier EXTENSION ::= {
 --        SYNTAX          SubjectKeyIdentifier
diff --git a/asn1/pkix1implicit/pkix1implicit-exp.cnf b/asn1/pkix1implicit/pkix1implicit-exp.cnf
index 9190b0e2fc..c3c898e0cc 100644
--- a/asn1/pkix1implicit/pkix1implicit-exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit-exp.cnf
@@ -8,11 +8,13 @@ PKIX1Implicit93  pkix1implicit
 #.END
 
 #.IMPORT_TAG
+KeyIdentifier            BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
 AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 #.END
 
 #.TYPE_ATTR
+KeyIdentifier            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 AuthorityInfoAccessSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 UserNotice               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END
diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index d567a0e4f6..3bfc3d33ad 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -12,6 +12,7 @@ PKIX1Explicit93 pkix1explicit
 #.EXPORTS
 
 AuthorityInfoAccessSyntax
+KeyIdentifier
 UserNotice
 
 #.PDU
diff --git a/asn1/pkix1implicit/pkix1implicit_exp.cnf b/asn1/pkix1implicit/pkix1implicit_exp.cnf
index 982b4642fb..d583aaa454 100644
--- a/asn1/pkix1implicit/pkix1implicit_exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit_exp.cnf
@@ -2,6 +2,7 @@
 #.IMPORT_TAG
 AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 GeneralName              BER_CLASS_CON -1/*choice*/
+KeyIdentifier            BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
 ReasonFlags		 BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 #.END
@@ -9,6 +10,7 @@ UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 #.TYPE_ATTR
 AuthorityInfoAccessSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+KeyIdentifier            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 ReasonFlags		 TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 UserNotice               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END