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

Embed various signature algorithms. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 568b8020

crypto/asn1/t_crl.c

+3 −3
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ int X509_CRL_print(BIO *out, X509_CRL *x) 
    BIO_printf(out, "Certificate Revocation List (CRL):\n");

    l = X509_CRL_get_version(x);

    BIO_printf(out, "%8sVersion %lu (0x%lx)\n", "", l + 1, l);

    i = OBJ_obj2nid(x->sig_alg->algorithm);

    X509_signature_print(out, x->sig_alg, NULL);

    i = OBJ_obj2nid(x->sig_alg.algorithm);

    X509_signature_print(out, &x->sig_alg, NULL);

    p = X509_NAME_oneline(X509_CRL_get_issuer(x), NULL, 0);

    BIO_printf(out, "%8sIssuer: %s\n", "", p);

    OPENSSL_free(p);
@@ -127,7 +127,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x) 
        X509V3_extensions_print(out, "CRL entry extensions",

                                r->extensions, 0, 8);

    }

    X509_signature_print(out, x->sig_alg, x->signature);

    X509_signature_print(out, &x->sig_alg, x->signature);



    return 1;

crypto/asn1/t_req.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
    }



    if (!(cflag & X509_FLAG_NO_SIGDUMP)) {

        if (!X509_signature_print(bp, x->sig_alg, x->signature))

        if (!X509_signature_print(bp, &x->sig_alg, x->signature))

            goto err;

    }

crypto/asn1/t_spki.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki) 
    chal = spki->spkac->challenge;

    if (chal->length)

        BIO_printf(out, "  Challenge String: %s\n", chal->data);

    i = OBJ_obj2nid(spki->sig_algor->algorithm);

    i = OBJ_obj2nid(spki->sig_algor.algorithm);

    BIO_printf(out, "  Signature Algorithm: %s",

               (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));

crypto/asn1/t_x509.c

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, 
    }



    if (!(cflag & X509_FLAG_NO_SIGNAME)) {

        if (X509_signature_print(bp, ci->signature, NULL) <= 0)

        if (X509_signature_print(bp, &ci->signature, NULL) <= 0)

            goto err;

    }
@@ -246,7 +246,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, 
                                ci->extensions, cflag, 8);



    if (!(cflag & X509_FLAG_NO_SIGDUMP)) {

        if (X509_signature_print(bp, x->sig_alg, x->signature) <= 0)

        if (X509_signature_print(bp, &x->sig_alg, x->signature) <= 0)

            goto err;

    }

    if (!(cflag & X509_FLAG_NO_AUX)) {

crypto/asn1/x_crl.c

+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, 


ASN1_SEQUENCE_enc(X509_CRL_INFO, enc, crl_inf_cb) = {

        ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),

        ASN1_SIMPLE(X509_CRL_INFO, sig_alg, X509_ALGOR),

        ASN1_EMBED(X509_CRL_INFO, sig_alg, X509_ALGOR),

        ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),

        ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),

        ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
@@ -332,7 +332,7 @@ static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp) 


ASN1_SEQUENCE_ref(X509_CRL, crl_cb, CRYPTO_LOCK_X509_CRL) = {

        ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),

        ASN1_SIMPLE(X509_CRL, sig_alg, X509_ALGOR),

        ASN1_EMBED(X509_CRL, sig_alg, X509_ALGOR),

        ASN1_SIMPLE(X509_CRL, signature, ASN1_BIT_STRING)

} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL)
@@ -394,7 +394,7 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) 
static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r)

{

    return (ASN1_item_verify(ASN1_ITEM_rptr(X509_CRL_INFO),

                             crl->sig_alg, crl->signature, &crl->crl, r));

                             &crl->sig_alg, crl->signature, &crl->crl, r));

}



static int crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm,