Commit a332635e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Embed various OCSP fields. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 44c734e9

crypto/ocsp/ocsp_asn.c

+6 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include "ocsp_lcl.h"



ASN1_SEQUENCE(OCSP_SIGNATURE) = {

        ASN1_SIMPLE(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),

        ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),

        ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)

} ASN1_SEQUENCE_END(OCSP_SIGNATURE)
@@ -70,7 +70,7 @@ ASN1_SEQUENCE(OCSP_SIGNATURE) = { 
IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)



ASN1_SEQUENCE(OCSP_CERTID) = {

        ASN1_SIMPLE(OCSP_CERTID, hashAlgorithm, X509_ALGOR),

        ASN1_EMBED(OCSP_CERTID, hashAlgorithm, X509_ALGOR),

        ASN1_SIMPLE(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),

        ASN1_SIMPLE(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),

        ASN1_SIMPLE(OCSP_CERTID, serialNumber, ASN1_INTEGER)
@@ -95,7 +95,7 @@ ASN1_SEQUENCE(OCSP_REQINFO) = { 
IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQINFO)



ASN1_SEQUENCE(OCSP_REQUEST) = {

        ASN1_SIMPLE(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),

        ASN1_EMBED(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),

        ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)

} ASN1_SEQUENCE_END(OCSP_REQUEST)
@@ -151,7 +151,7 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_SINGLERESP) 


ASN1_SEQUENCE(OCSP_RESPDATA) = {

           ASN1_EXP_OPT(OCSP_RESPDATA, version, ASN1_INTEGER, 0),

           ASN1_SIMPLE(OCSP_RESPDATA, responderId, OCSP_RESPID),

           ASN1_EMBED(OCSP_RESPDATA, responderId, OCSP_RESPID),

           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)
@@ -160,8 +160,8 @@ ASN1_SEQUENCE(OCSP_RESPDATA) = { 
IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPDATA)



ASN1_SEQUENCE(OCSP_BASICRESP) = {

           ASN1_SIMPLE(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),

           ASN1_SIMPLE(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),

           ASN1_EMBED(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),

           ASN1_EMBED(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)

crypto/ocsp/ocsp_cl.c

+6 −6
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid) 
        goto err;

    OCSP_CERTID_free(one->reqCert);

    one->reqCert = cid;

    if (req && !sk_OCSP_ONEREQ_push(req->tbsRequest->requestList, one))

    if (req && !sk_OCSP_ONEREQ_push(req->tbsRequest.requestList, one))

        goto err;

    return one;

 err:
@@ -115,8 +115,8 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm) 
        return 0;

    }

    gen->type = GEN_DIRNAME;

    GENERAL_NAME_free(req->tbsRequest->requestorName);

    req->tbsRequest->requestorName = gen;

    GENERAL_NAME_free(req->tbsRequest.requestorName);

    req->tbsRequest.requestorName = gen;

    return 1;

}
@@ -230,7 +230,7 @@ int OCSP_resp_count(OCSP_BASICRESP *bs) 
{

    if (!bs)

        return -1;

    return sk_OCSP_SINGLERESP_num(bs->tbsResponseData->responses);

    return sk_OCSP_SINGLERESP_num(bs->tbsResponseData.responses);

}



/* Extract an OCSP_SINGLERESP response with a given index */
@@ -239,7 +239,7 @@ OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx) 
{

    if (!bs)

        return NULL;

    return sk_OCSP_SINGLERESP_value(bs->tbsResponseData->responses, idx);

    return sk_OCSP_SINGLERESP_value(bs->tbsResponseData.responses, idx);

}



/* Look single response matching a given certificate ID */
@@ -255,7 +255,7 @@ int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last) 
        last = 0;

    else

        last++;

    sresp = bs->tbsResponseData->responses;

    sresp = bs->tbsResponseData.responses;

    for (i = last; i < sk_OCSP_SINGLERESP_num(sresp); i++) {

        single = sk_OCSP_SINGLERESP_value(sresp, i);

        if (!OCSP_id_cmp(id, single->certId))

crypto/ocsp/ocsp_ext.c

+20 −20
Original line number Diff line number Diff line
@@ -79,53 +79,53 @@ 


int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)

{

    return (X509v3_get_ext_count(x->tbsRequest->requestExtensions));

    return (X509v3_get_ext_count(x->tbsRequest.requestExtensions));

}



int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID

            (x->tbsRequest->requestExtensions, nid, lastpos));

            (x->tbsRequest.requestExtensions, nid, lastpos));

}



int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj,

                                int lastpos)

{

    return (X509v3_get_ext_by_OBJ

            (x->tbsRequest->requestExtensions, obj, lastpos));

            (x->tbsRequest.requestExtensions, obj, lastpos));

}



int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)

{

    return (X509v3_get_ext_by_critical

            (x->tbsRequest->requestExtensions, crit, lastpos));

            (x->tbsRequest.requestExtensions, crit, lastpos));

}



X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)

{

    return (X509v3_get_ext(x->tbsRequest->requestExtensions, loc));

    return (X509v3_get_ext(x->tbsRequest.requestExtensions, loc));

}



X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc)

{

    return (X509v3_delete_ext(x->tbsRequest->requestExtensions, loc));

    return (X509v3_delete_ext(x->tbsRequest.requestExtensions, loc));

}



void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)

{

    return X509V3_get_d2i(x->tbsRequest->requestExtensions, nid, crit, idx);

    return X509V3_get_d2i(x->tbsRequest.requestExtensions, nid, crit, idx);

}



int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,

                              unsigned long flags)

{

    return X509V3_add1_i2d(&x->tbsRequest->requestExtensions, nid, value,

    return X509V3_add1_i2d(&x->tbsRequest.requestExtensions, nid, value,

                           crit, flags);

}



int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)

{

    return (X509v3_add_ext(&(x->tbsRequest->requestExtensions), ex, loc) !=

    return (X509v3_add_ext(&(x->tbsRequest.requestExtensions), ex, loc) !=

            NULL);

}
@@ -183,56 +183,56 @@ int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc) 


int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)

{

    return (X509v3_get_ext_count(x->tbsResponseData->responseExtensions));

    return (X509v3_get_ext_count(x->tbsResponseData.responseExtensions));

}



int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)

{

    return (X509v3_get_ext_by_NID

            (x->tbsResponseData->responseExtensions, nid, lastpos));

            (x->tbsResponseData.responseExtensions, nid, lastpos));

}



int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj,

                                  int lastpos)

{

    return (X509v3_get_ext_by_OBJ

            (x->tbsResponseData->responseExtensions, obj, lastpos));

            (x->tbsResponseData.responseExtensions, obj, lastpos));

}



int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,

                                       int lastpos)

{

    return (X509v3_get_ext_by_critical

            (x->tbsResponseData->responseExtensions, crit, lastpos));

            (x->tbsResponseData.responseExtensions, crit, lastpos));

}



X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)

{

    return (X509v3_get_ext(x->tbsResponseData->responseExtensions, loc));

    return (X509v3_get_ext(x->tbsResponseData.responseExtensions, loc));

}



X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc)

{

    return (X509v3_delete_ext(x->tbsResponseData->responseExtensions, loc));

    return (X509v3_delete_ext(x->tbsResponseData.responseExtensions, loc));

}



void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,

                                  int *idx)

{

    return X509V3_get_d2i(x->tbsResponseData->responseExtensions, nid, crit,

    return X509V3_get_d2i(x->tbsResponseData.responseExtensions, nid, crit,

                          idx);

}



int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,

                                int crit, unsigned long flags)

{

    return X509V3_add1_i2d(&x->tbsResponseData->responseExtensions, nid,

    return X509V3_add1_i2d(&x->tbsResponseData.responseExtensions, nid,

                           value, crit, flags);

}



int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)

{

    return (X509v3_add_ext(&(x->tbsResponseData->responseExtensions), ex, loc)

    return (X509v3_add_ext(&(x->tbsResponseData.responseExtensions), ex, loc)

            != NULL);

}
@@ -334,14 +334,14 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, 


int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)

{

    return ocsp_add1_nonce(&req->tbsRequest->requestExtensions, val, len);

    return ocsp_add1_nonce(&req->tbsRequest.requestExtensions, val, len);

}



/* Same as above but for a response */



int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)

{

    return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val,

    return ocsp_add1_nonce(&resp->tbsResponseData.responseExtensions, val,

                           len);

}

crypto/ocsp/ocsp_lcl.h

+6 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
 *       serialNumber       CertificateSerialNumber }

 */

struct ocsp_cert_id_st {

    X509_ALGOR *hashAlgorithm;

    X509_ALGOR hashAlgorithm;

    ASN1_OCTET_STRING *issuerNameHash;

    ASN1_OCTET_STRING *issuerKeyHash;

    ASN1_INTEGER *serialNumber;
@@ -105,7 +105,7 @@ struct ocsp_req_info_st { 
 *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }

 */

struct ocsp_signature_st {

    X509_ALGOR *signatureAlgorithm;

    X509_ALGOR signatureAlgorithm;

    ASN1_BIT_STRING *signature;

    STACK_OF(X509) *certs;

};
@@ -115,7 +115,7 @@ struct ocsp_signature_st { 
 *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }

 */

struct ocsp_request_st {

    OCSP_REQINFO *tbsRequest;

    OCSP_REQINFO tbsRequest;

    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */

};
@@ -211,7 +211,7 @@ struct ocsp_single_response_st { 
 */

struct ocsp_response_data_st {

    ASN1_INTEGER *version;

    OCSP_RESPID *responderId;

    OCSP_RESPID responderId;

    ASN1_GENERALIZEDTIME *producedAt;

    STACK_OF(OCSP_SINGLERESP) *responses;

    STACK_OF(X509_EXTENSION) *responseExtensions;
@@ -244,8 +244,8 @@ struct ocsp_response_data_st { 
   * and CeloCom

   */

struct ocsp_basic_response_st {

    OCSP_RESPDATA *tbsResponseData;

    X509_ALGOR *signatureAlgorithm;

    OCSP_RESPDATA tbsResponseData;

    X509_ALGOR signatureAlgorithm;

    ASN1_BIT_STRING *signature;

    STACK_OF(X509) *certs;

};

crypto/ocsp/ocsp_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, 
    if ((cid = OCSP_CERTID_new()) == NULL)

        goto err;



    alg = cid->hashAlgorithm;

    alg = &cid->hashAlgorithm;

    ASN1_OBJECT_free(alg->algorithm);

    if ((nid = EVP_MD_type(dgst)) == NID_undef) {

        OCSPerr(OCSP_F_OCSP_CERT_ID_NEW, OCSP_R_UNKNOWN_NID);
@@ -149,7 +149,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, 
int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b)

{

    int ret;

    ret = OBJ_cmp(a->hashAlgorithm->algorithm, b->hashAlgorithm->algorithm);

    ret = OBJ_cmp(a->hashAlgorithm.algorithm, b->hashAlgorithm.algorithm);

    if (ret)

        return ret;

    ret = ASN1_OCTET_STRING_cmp(a->issuerNameHash, b->issuerNameHash);