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

constify X509_ALGOR_get0() 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 0c800648

apps/pkcs12.c

+3 −3
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ int pkcs12_main(int argc, char **argv) 
    if ((options & INFO) && PKCS12_mac_present(p12)) {

        ASN1_INTEGER *tmaciter;

        X509_ALGOR *macalgid;

        ASN1_OBJECT *macobj;

        const ASN1_OBJECT *macobj;

        PKCS12_get0_mac(NULL, &macalgid, NULL, &tmaciter, p12);

        X509_ALGOR_get0(&macobj, NULL, NULL, macalgid);

        BIO_puts(bio_err, "MAC:");
@@ -743,8 +743,8 @@ end: 
static int alg_print(X509_ALGOR *alg)

{

    int pbenid, aparamtype;

    ASN1_OBJECT *aoid;

    void *aparam;

    const ASN1_OBJECT *aoid;

    const void *aparam;

    PBEPARAM *pbe = NULL;



    X509_ALGOR_get0(&aoid, &aparamtype, &aparam, alg);

crypto/asn1/x_algor.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval) 
    return 1;

}



void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,

                     X509_ALGOR *algor)

void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,

                     const void **ppval, const X509_ALGOR *algor)

{

    if (paobj)

        *paobj = algor->algorithm;

crypto/cms/cms_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ int CMS_set_detached(CMS_ContentInfo *cms, int detached) 
BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm)

{

    BIO *mdbio = NULL;

    ASN1_OBJECT *digestoid;

    const ASN1_OBJECT *digestoid;

    const EVP_MD *digest;

    X509_ALGOR_get0(&digestoid, NULL, NULL, digestAlgorithm);

    digest = EVP_get_digestbyobj(digestoid);
@@ -312,7 +312,7 @@ int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain, 
                                 X509_ALGOR *mdalg)

{

    int nid;

    ASN1_OBJECT *mdoid;

    const ASN1_OBJECT *mdoid;

    X509_ALGOR_get0(&mdoid, NULL, NULL, mdalg);

    nid = OBJ_obj2nid(mdoid);

    /* Look for digest type to match signature */

crypto/cms/cms_sd.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, 


    /* See if digest is present in digestAlgorithms */

    for (i = 0; i < sk_X509_ALGOR_num(sd->digestAlgorithms); i++) {

        ASN1_OBJECT *aoid;

        const ASN1_OBJECT *aoid;

        alg = sk_X509_ALGOR_value(sd->digestAlgorithms, i);

        X509_ALGOR_get0(&aoid, NULL, NULL, alg);

        if (OBJ_obj2nid(aoid) == EVP_MD_type(md))

crypto/dh/dh_ameth.c

+7 −7
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) 
    const unsigned char *p, *pm;

    int pklen, pmlen;

    int ptype;

    void *pval;

    ASN1_STRING *pstr;

    const void *pval;

    const ASN1_STRING *pstr;

    X509_ALGOR *palg;

    ASN1_INTEGER *public_key = NULL;
@@ -152,8 +152,8 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) 
    const unsigned char *p, *pm;

    int pklen, pmlen;

    int ptype;

    void *pval;

    ASN1_STRING *pstr;

    const void *pval;

    const ASN1_STRING *pstr;

    X509_ALGOR *palg;

    ASN1_INTEGER *privkey = NULL;
@@ -574,9 +574,9 @@ const EVP_PKEY_ASN1_METHOD dhx_asn1_meth = { 
static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,

                              X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)

{

    ASN1_OBJECT *aoid;

    const ASN1_OBJECT *aoid;

    int atype;

    void *aval;

    const void *aval;

    ASN1_INTEGER *public_key = NULL;

    int rv = 0;

    EVP_PKEY *pkpeer = NULL, *pk = NULL;
@@ -741,7 +741,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri) 
    EVP_CIPHER_CTX *ctx;

    int keylen;

    X509_ALGOR *talg, *wrap_alg = NULL;

    ASN1_OBJECT *aoid;

    const ASN1_OBJECT *aoid;

    ASN1_BIT_STRING *pubkey;

    ASN1_STRING *wrap_str;

    ASN1_OCTET_STRING *ukm;