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

constify X509_REQ_get0_signature() 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 60c25873

crypto/x509/t_req.c

+3 −3
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
    }



    if (!(cflag & X509_FLAG_NO_SIGDUMP)) {

        X509_ALGOR *sig_alg;

        ASN1_BIT_STRING *sig;

        X509_REQ_get0_signature(&sig, &sig_alg, x);

        const X509_ALGOR *sig_alg;

        const ASN1_BIT_STRING *sig;

        X509_REQ_get0_signature(x, &sig, &sig_alg);

        if (!X509_signature_print(bp, sig_alg, sig))

            goto err;

    }

crypto/x509/x509_req.c

+2 −2
Original line number Diff line number Diff line
@@ -277,8 +277,8 @@ X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req) 
    return req->req_info.subject;

}



void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,

                             X509_REQ *req)

void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,

                             const X509_ALGOR **palg)

{

    if (psig != NULL)

        *psig = req->signature;

doc/crypto/X509_get0_signature.pod

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ X509_CRL_get_signature_nid - signature information 
 int X509_get_signature_nid(const X509 *x);

 const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x);



 void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,

                              const X509_REQ *crl);

 void X509_REQ_get0_signature(const X509_REQ *crl,

                              const ASN1_BIT_STRING **psig,

                              const X509_ALGOR **palg);

 int X509_REQ_get_signature_nid(const X509_REQ *crl);



 void X509_CRL_get0_signature(const X509_CRL *crl,

include/openssl/x509.h

+2 −2
Original line number Diff line number Diff line
@@ -647,8 +647,8 @@ long X509_REQ_get_version(const X509_REQ *req); 
int X509_REQ_set_version(X509_REQ *x, long version);

X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req);

int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);

void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,

                             X509_REQ *req);

void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,

                             const X509_ALGOR **palg);

int X509_REQ_get_signature_nid(const X509_REQ *req);

int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp);

int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);