diff options
author | Martin Kaiser <wireshark@kaiser.cx> | 2013-09-12 21:29:50 +0000 |
---|---|---|
committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-09-12 21:29:50 +0000 |
commit | fd50ee16e8b595c9bdc2cdc7e7236c75586d6a9a (patch) | |
tree | a6079a5f420c6186b9a32fa2f89c3d92623ea96f /asn1 | |
parent | c7f22db4d2bddaba5ef9973c2dc0d7a5c23643b6 (diff) |
dissect OCSP nonce extension
some minor reformatting of the ASN.1 imports
svn path=/trunk/; revision=51987
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ocsp/OCSP.asn | 44 | ||||
-rw-r--r-- | asn1/ocsp/ocsp.cnf | 1 |
2 files changed, 29 insertions, 16 deletions
diff --git a/asn1/ocsp/OCSP.asn b/asn1/ocsp/OCSP.asn index 7ce61f95ec..c2e17297f9 100644 --- a/asn1/ocsp/OCSP.asn +++ b/asn1/ocsp/OCSP.asn @@ -39,26 +39,31 @@ BEGIN IMPORTS - -- Directory Authentication Framework (X.509) - Certificate, AlgorithmIdentifier - FROM AuthenticationFramework { joint-iso-itu-t ds(5) - module(1) authenticationFramework(7) 3 } + authenticationFramework + FROM UsefulDefinitions {joint-iso-itu-t ds(5) module(1) + usefulDefinitions(0) 5} - CRLReason - FROM CertificateExtensions + EXTENSION + FROM AuthenticationFramework authenticationFramework --- PKIX Certificate Extensions - AuthorityInfoAccessSyntax - FROM PKIX1Implicit88 {iso(1) identified-organization(3) - dod(6) internet(1) security(5) mechanisms(5) pkix(7) - id-mod(0) id-pkix1-implicit-88(2)} + -- Directory Authentication Framework (X.509) + Certificate, AlgorithmIdentifier + FROM AuthenticationFramework { joint-iso-itu-t ds(5) + module(1) authenticationFramework(7) 3 } + CRLReason + FROM CertificateExtensions - Name, GeneralName, CertificateSerialNumber, Extensions, - id-kp, id-ad-ocsp - FROM PKIX1Explicit88 {iso(1) identified-organization(3) - dod(6) internet(1) security(5) mechanisms(5) pkix(7) - id-mod(0) id-pkix1-explicit-88(1)}; + -- PKIX Certificate Extensions + AuthorityInfoAccessSyntax + FROM PKIX1Implicit88 {iso(1) identified-organization(3) + dod(6) internet(1) security(5) mechanisms(5) pkix(7) + id-mod(0) id-pkix1-implicit-88(2)} + + Name, GeneralName, CertificateSerialNumber, Extensions, id-kp, id-ad-ocsp + FROM PKIX1Explicit88 {iso(1) identified-organization(3) + dod(6) internet(1) security(5) mechanisms(5) pkix(7) + id-mod(0) id-pkix1-explicit-88(1)}; OCSPRequest ::= SEQUENCE { tbsRequest TBSRequest, @@ -156,6 +161,13 @@ CrlID ::= SEQUENCE { crlNum [1] EXPLICIT INTEGER OPTIONAL, crlTime [2] EXPLICIT GeneralizedTime OPTIONAL } +re-ocsp-nonce EXTENSION ::= { + SYNTAX ReOcspNonce + IDENTIFIED BY id-pkix-ocsp-nonce +} + +ReOcspNonce ::= OCTET STRING + -- Object Identifiers diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 3245d4be6b..2e8dbb8fd5 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -24,6 +24,7 @@ OCSPResponse #.REGISTER BasicOCSPResponse B "1.3.6.1.5.5.7.48.1.1" "id-pkix-ocsp-basic" +ReOcspNonce B "1.3.6.1.5.5.7.48.1.2" "id-pkix-ocsp-nonce" CrlID B "1.3.6.1.5.5.7.48.1.3" "id-pkix-ocsp-crl" AcceptableResponses B "1.3.6.1.5.5.7.48.1.4" "id-pkix-ocsp-response" NULL B "1.3.6.1.5.5.7.48.1.5" "id-pkix-ocsp-nocheck" |