X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Focsp%2Focsp_asn.c;h=39b7a1c5687163eb0e257d2c6eefc7247bec6bc2;hp=336d5e396b9097af7b09c529d1bd3bc0e536d3ef;hb=28b987aec9474e8c0cf1cc12273018edf3a1eca1;hpb=5755cab49dd5a0d69f69e07c0bd6bdba175308cf

diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 336d5e396b..39b7a1c568 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -1,4 +1,4 @@
-/* ocsp.c */
+/* ocsp_asn.c */
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project 2000.
  */
@@ -62,8 +62,8 @@
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
 	ASN1_SIMPLE(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
 	ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
-	ASN1_SEQUENCE_OF(OCSP_SIGNATURE, certs, X509)
-} ASN1_SEQUENCE_END(OCSP_SIGNATURE);
+	ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
+} ASN1_SEQUENCE_END(OCSP_SIGNATURE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)
 
@@ -72,14 +72,14 @@ ASN1_SEQUENCE(OCSP_CERTID) = {
 	ASN1_SIMPLE(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
 	ASN1_SIMPLE(OCSP_CERTID, serialNumber, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(OCSP_CERTID);
+} ASN1_SEQUENCE_END(OCSP_CERTID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTID)
 
 ASN1_SEQUENCE(OCSP_ONEREQ) = {
 	ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
 	ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
-} ASN1_SEQUENCE_END(OCSP_ONEREQ);
+} ASN1_SEQUENCE_END(OCSP_ONEREQ)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_ONEREQ)
 
@@ -88,14 +88,14 @@ ASN1_SEQUENCE(OCSP_REQINFO) = {
 	ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
 	ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
 	ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
-} ASN1_SEQUENCE_END(OCSP_REQINFO);
+} ASN1_SEQUENCE_END(OCSP_REQINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQINFO)
 
 ASN1_SEQUENCE(OCSP_REQUEST) = {
 	ASN1_SIMPLE(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
 	ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
-} ASN1_SEQUENCE_END(OCSP_REQUEST);
+} ASN1_SEQUENCE_END(OCSP_REQUEST)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
 
@@ -104,26 +104,28 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
 ASN1_SEQUENCE(OCSP_RESPBYTES) = {
 	    ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
 	    ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(OCSP_RESPBYTES);
+} ASN1_SEQUENCE_END(OCSP_RESPBYTES)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPBYTES)
 
 ASN1_SEQUENCE(OCSP_RESPONSE) = {
 	ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
 	ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
-} ASN1_SEQUENCE_END(OCSP_RESPONSE);
+} ASN1_SEQUENCE_END(OCSP_RESPONSE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPONSE)
 
 ASN1_CHOICE(OCSP_RESPID) = {
 	   ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
-	   ASN1_IMP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
-} ASN1_CHOICE_END(OCSP_RESPID);
+	   ASN1_EXP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
+} ASN1_CHOICE_END(OCSP_RESPID)
+
+IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPID)
 
 ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
 	ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
   	ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
-} ASN1_SEQUENCE_END(OCSP_REVOKEDINFO);
+} ASN1_SEQUENCE_END(OCSP_REVOKEDINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
 
@@ -131,7 +133,7 @@ ASN1_CHOICE(OCSP_CERTSTATUS) = {
 	ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
 	ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
 	ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
-} ASN1_CHOICE_END(OCSP_CERTSTATUS);
+} ASN1_CHOICE_END(OCSP_CERTSTATUS)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
 
@@ -141,7 +143,7 @@ ASN1_SEQUENCE(OCSP_SINGLERESP) = {
 	   ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
 	   ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
-} ASN1_SEQUENCE_END(OCSP_SINGLERESP);
+} ASN1_SEQUENCE_END(OCSP_SINGLERESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SINGLERESP)
 
@@ -151,7 +153,7 @@ ASN1_SEQUENCE(OCSP_RESPDATA) = {
 	   ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
 	   ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
-} ASN1_SEQUENCE_END(OCSP_RESPDATA);
+} ASN1_SEQUENCE_END(OCSP_RESPDATA)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPDATA)
 
@@ -160,7 +162,7 @@ ASN1_SEQUENCE(OCSP_BASICRESP) = {
 	   ASN1_SIMPLE(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
 	   ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
 	   ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
-} ASN1_SEQUENCE_END(OCSP_BASICRESP);
+} ASN1_SEQUENCE_END(OCSP_BASICRESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_BASICRESP)
 
@@ -168,13 +170,13 @@ ASN1_SEQUENCE(OCSP_CRLID) = {
 	   ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
 	   ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
 	   ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
-} ASN1_SEQUENCE_END(OCSP_CRLID);
+} ASN1_SEQUENCE_END(OCSP_CRLID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CRLID)
 
 ASN1_SEQUENCE(OCSP_SERVICELOC) = {
 	ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
 	ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
-} ASN1_SEQUENCE_END(OCSP_SERVICELOC);
+} ASN1_SEQUENCE_END(OCSP_SERVICELOC)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SERVICELOC)