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

embed OCSP_CERTID 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 47c9a1b5

crypto/ocsp/ocsp_asn.c

+3 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE) 


ASN1_SEQUENCE(OCSP_CERTID) = {

        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)

        ASN1_EMBED(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),

        ASN1_EMBED(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),

        ASN1_EMBED(OCSP_CERTID, serialNumber, ASN1_INTEGER)

} ASN1_SEQUENCE_END(OCSP_CERTID)



IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTID)

crypto/ocsp/ocsp_lcl.h

+3 −3
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ 
 */

struct ocsp_cert_id_st {

    X509_ALGOR hashAlgorithm;

    ASN1_OCTET_STRING *issuerNameHash;

    ASN1_OCTET_STRING *issuerKeyHash;

    ASN1_INTEGER *serialNumber;

    ASN1_OCTET_STRING issuerNameHash;

    ASN1_OCTET_STRING issuerKeyHash;

    ASN1_INTEGER serialNumber;

};



/*-  Request ::=     SEQUENCE {

crypto/ocsp/ocsp_lib.c

+6 −7
Original line number Diff line number Diff line
@@ -123,19 +123,18 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, 


    if (!X509_NAME_digest(issuerName, dgst, md, &i))

        goto digerr;

    if (!(ASN1_OCTET_STRING_set(cid->issuerNameHash, md, i)))

    if (!(ASN1_OCTET_STRING_set(&cid->issuerNameHash, md, i)))

        goto err;



    /* Calculate the issuerKey hash, excluding tag and length */

    if (!EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL))

        goto err;



    if (!(ASN1_OCTET_STRING_set(cid->issuerKeyHash, md, i)))

    if (!(ASN1_OCTET_STRING_set(&cid->issuerKeyHash, md, i)))

        goto err;



    if (serialNumber) {

        ASN1_INTEGER_free(cid->serialNumber);

        if ((cid->serialNumber = ASN1_INTEGER_dup(serialNumber)) == NULL)

        if (ASN1_STRING_copy(&cid->serialNumber, serialNumber) == 0)

            goto err;

    }

    return cid;
@@ -152,10 +151,10 @@ int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b) 
    ret = OBJ_cmp(a->hashAlgorithm.algorithm, b->hashAlgorithm.algorithm);

    if (ret)

        return ret;

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

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

    if (ret)

        return ret;

    return ASN1_OCTET_STRING_cmp(a->issuerKeyHash, b->issuerKeyHash);

    return ASN1_OCTET_STRING_cmp(&a->issuerKeyHash, &b->issuerKeyHash);

}



int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b)
@@ -164,7 +163,7 @@ int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b) 
    ret = OCSP_id_issuer_cmp(a, b);

    if (ret)

        return ret;

    return ASN1_INTEGER_cmp(a->serialNumber, b->serialNumber);

    return ASN1_INTEGER_cmp(&a->serialNumber, &b->serialNumber);

}



/*

crypto/ocsp/ocsp_prn.c

+3 −3
Original line number Diff line number Diff line
@@ -77,11 +77,11 @@ static int ocsp_certid_print(BIO *bp, OCSP_CERTID *a, int indent) 
    BIO_printf(bp, "%*sHash Algorithm: ", indent, "");

    i2a_ASN1_OBJECT(bp, a->hashAlgorithm.algorithm);

    BIO_printf(bp, "\n%*sIssuer Name Hash: ", indent, "");

    i2a_ASN1_STRING(bp, a->issuerNameHash, V_ASN1_OCTET_STRING);

    i2a_ASN1_STRING(bp, &a->issuerNameHash, V_ASN1_OCTET_STRING);

    BIO_printf(bp, "\n%*sIssuer Key Hash: ", indent, "");

    i2a_ASN1_STRING(bp, a->issuerKeyHash, V_ASN1_OCTET_STRING);

    i2a_ASN1_STRING(bp, &a->issuerKeyHash, V_ASN1_OCTET_STRING);

    BIO_printf(bp, "\n%*sSerial Number: ", indent, "");

    i2a_ASN1_INTEGER(bp, a->serialNumber);

    i2a_ASN1_INTEGER(bp, &a->serialNumber);

    BIO_printf(bp, "\n");

    return 1;

}

crypto/ocsp/ocsp_srv.c

+3 −3
Original line number Diff line number Diff line
@@ -96,11 +96,11 @@ int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, 
    if (pmd)

        *pmd = cid->hashAlgorithm.algorithm;

    if (piNameHash)

        *piNameHash = cid->issuerNameHash;

        *piNameHash = &cid->issuerNameHash;

    if (pikeyHash)

        *pikeyHash = cid->issuerKeyHash;

        *pikeyHash = &cid->issuerKeyHash;

    if (pserial)

        *pserial = cid->serialNumber;

        *pserial = &cid->serialNumber;

    return 1;

}