add dissection of AuthorityInfoAccessSyntax

svn path=/trunk/; revision=12552

3 files changed, 28 insertions, 23 deletions

diff --git a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
index b65b33cd14..828b1898a4 100644
--- a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
+++ b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
@@ -177,24 +177,24 @@ Dummy ::= NULL
 --        IDENTIFIED BY id-ce-subjectAltName }
 --
 --GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
---
---GeneralName ::= CHOICE {
+
+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
---
---EDIPartyName ::= SEQUENCE {
---        nameAssigner        [0] DirectoryString {ub-name} OPTIONAL,
---        partyName           [1] DirectoryString {ub-name} }
---
+
+EDIPartyName ::= SEQUENCE {
+        nameAssigner        [0] DirectoryString OPTIONAL,
+        partyName           [1] DirectoryString }
+
 --issuerAltName EXTENSION ::= {
 --        SYNTAX  GeneralNames
 --        IDENTIFIED BY id-ce-issuerAltName }
@@ -365,14 +365,14 @@ Dummy ::= NULL
 --authorityInfoAccess EXTENSION ::= {
 --        SYNTAX  AuthorityInfoAccessSyntax
 --        IDENTIFIED BY id-pe-authorityInfoAccess }
---
---AuthorityInfoAccessSyntax  ::=
---        SEQUENCE SIZE (1..MAX) OF AccessDescription
---
---AccessDescription  ::=  SEQUENCE {
---        accessMethod          OBJECT IDENTIFIER,
---        accessLocation        GeneralName  }
---
+
+AuthorityInfoAccessSyntax  ::=
+        SEQUENCE SIZE (1..MAX) OF AccessDescription
+
+AccessDescription  ::=  SEQUENCE {
+        accessMethod          OBJECT IDENTIFIER,
+        accessLocation        GeneralName  }
+
 --id-pe-authorityInfoAccess OBJECT IDENTIFIER ::= { id-pe 1 }
 --
 --id-ad-ocsp      OBJECT IDENTIFIER ::= { id-ad 1 }
diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index b064db52b7..15763907e4 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -35,6 +35,7 @@
 
 #include "packet-ber.h"
 #include "packet-pkix1implicit.h"
+#include "packet-pkix1explicit.h"
 
 #define PNAME  "PKIX1Implitit"
 #define PSNAME "PKIX1IMPLICIT"
diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index 5637a589a8..977ee02996 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -4,6 +4,9 @@
 # $Id$
 
 #.MODULE_IMPORT
+PKIX1Explicit93 pkix1explicit
+
+#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
 
 #.EXPORTS
 
@@ -12,6 +15,7 @@ UserNotice
 #.PDU
 
 #.REGISTER
+AuthorityInfoAccessSyntax B "1.3.6.1.5.5.7.1.1" "id-pe-authorityInfoAccessSyntax"
 Dummy         B "1.3.6.1.5.5.7.3.1"  "id-kp-serverAuth"
 Dummy         B "1.3.6.1.5.5.7.3.2"  "id-kp-clientAuth"
 Dummy         B "1.3.6.1.5.5.7.3.3"  "id-kp-codeSigning"