updates to pkix1implicit (we have to think about how to rewrite both pkix1eplicit and pkix1implicit to avoid the crap with duplicate definitions from x509)

New protocol : RFC3161  PKIX TimeStamp Protocol



svn path=/trunk/; revision=12669

5 files changed, 29 insertions, 11 deletions

diff --git a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
index 828b1898a4..ded089d4c2 100644
--- a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
+++ b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
@@ -64,7 +64,9 @@ IMPORTS
                 Attribute, EXTENSION
                 FROM PKIX1Explicit93 {iso(1) identified-organization(3)
                 dod(6) internet(1) security(5) mechanisms(5) pkix(7)
-                id-mod(0) id-pkix1-explicit-93(3)};
+                id-mod(0) id-pkix1-explicit-93(3)}
+	GeneralName FROM CertificateExtensions;
+
 
 -- Key and policy information extensions
 --
@@ -177,17 +179,19 @@ Dummy ::= NULL
 --        IDENTIFIED BY id-ce-subjectAltName }
 --
 --GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
-
-GeneralName ::= CHOICE {
+--
+--Imported from X509CE
+--GeneralName ::= CHOICE {
 --        otherName                   [0] INSTANCE OF OTHER-NAME,
-        rfc822Name                  [1] IA5String,
-        dNSName                     [2] IA5String,
+--        rfc822Name                  [1] IA5String,
+--        dNSName                     [2] IA5String,
 --        x400Address                 [3] ORAddress,
-        directoryName               [4] Name,
-        ediPartyName                [5] EDIPartyName,
-        uniformResourceIdentifier   [6] IA5String,
-        iPAddress                   [7] OCTET STRING,
-        registeredID                [8] OBJECT IDENTIFIER }
+--        directoryName               [4] Name,
+--        ediPartyName                [5] EDIPartyName,
+--        uniformResourceIdentifier   [6] IA5String,
+--        iPAddress                   [7] OCTET STRING,
+--        registeredID                [8] OBJECT IDENTIFIER 
+--}
 
 --OTHER-NAME ::= TYPE-IDENTIFIER
 
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index 15763907e4..bc6e0c1d14 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -36,6 +36,7 @@
 #include "packet-ber.h"
 #include "packet-pkix1implicit.h"
 #include "packet-pkix1explicit.h"
+#include "packet-x509ce.h"
 
 #define PNAME  "PKIX1Implitit"
 #define PSNAME "PKIX1IMPLICIT"
@@ -49,6 +50,13 @@ static int proto_pkix1implicit = -1;
 #include "packet-pkix1implicit-ett.c"
 
 
+int
+dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_x509ce_GeneralName(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+
 #include "packet-pkix1implicit-fn.c"
 
 
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.h b/asn1/pkix1implicit/packet-pkix1implicit-template.h
index 12b712b5bc..d6f860cf1f 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.h
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.h
@@ -25,6 +25,8 @@
 #ifndef PACKET_PKIX1IMPLICIT_H
 #define PACKET_PKIX1IMPLICIT_H
 
+int dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_);
+
 #include "packet-pkix1implicit-exp.h"
 
 #endif  /* PACKET_PKIX1IMPLICIT_H */
diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index bae9431e17..7aea434712 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -5,13 +5,15 @@
 
 #.MODULE_IMPORT
 PKIX1Explicit93 pkix1explicit
+CertificateExtensions x509ce
 
 #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
+#.INCLUDE ../x509ce/x509ce-exp.cnf
 
 #.EXPORTS
 
-UserNotice
 AuthorityInfoAccessSyntax
+UserNotice
 
 #.PDU
 
diff --git a/asn1/pkix1implicit/pkix1implicit_exp.cnf b/asn1/pkix1implicit/pkix1implicit_exp.cnf
index 38d515bca5..849f073b1a 100644
--- a/asn1/pkix1implicit/pkix1implicit_exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit_exp.cnf
@@ -1,11 +1,13 @@
 
 #.IMPORT_TAG
 AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+GeneralName              BER_CLASS_CON -1/*choice*/
 UserNotice               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 #.END
 
 #.TYPE_ATTR
 AuthorityInfoAccessSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 UserNotice               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END