Commit 28da1455 authored by Matt Caswell's avatar Matt Caswell Committed by Dr. Stephen Henson
Browse files

Convert PKCS12* functions to use const getters 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent 7f35b7d9

apps/pkcs12.c

+21 −19
Original line number Diff line number Diff line
@@ -29,14 +29,15 @@ NON_EMPTY_TRANSLATION_UNIT 


static int get_cert_chain(X509 *cert, X509_STORE *store,

                          STACK_OF(X509) **chain);

int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen,

int dump_certs_keys_p12(BIO *out, const PKCS12 *p12,

                        const char *pass, int passlen, int options,

                        char *pempass, const EVP_CIPHER *enc);

int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,

                          const char *pass, int passlen, int options,

                          char *pempass, const EVP_CIPHER *enc);

int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bags,

                         const char *pass, int passlen,

                         int options, char *pempass, const EVP_CIPHER *enc);

int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,

                          char *pass, int passlen, int options, char *pempass,

                          const EVP_CIPHER *enc);

int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass,

                         int passlen, int options, char *pempass,

                         const EVP_CIPHER *enc);

int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,

                  const char *name);

void hex_prin(BIO *out, unsigned char *buf, int len);
@@ -563,7 +564,7 @@ int pkcs12_main(int argc, char **argv) 
    return (ret);

}



int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass,

int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,

                        int passlen, int options, char *pempass,

                        const EVP_CIPHER *enc)

{
@@ -607,9 +608,9 @@ int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, 
    return ret;

}



int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,

                          char *pass, int passlen, int options, char *pempass,

                          const EVP_CIPHER *enc)

int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,

                          const char *pass, int passlen, int options,

                          char *pempass, const EVP_CIPHER *enc)

{

    int i;

    for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
@@ -621,14 +622,15 @@ int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, 
    return 1;

}



int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,

                         int passlen, int options, char *pempass,

                         const EVP_CIPHER *enc)

int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,

                         const char *pass, int passlen, int options,

                         char *pempass, const EVP_CIPHER *enc)

{

    EVP_PKEY *pkey;

    PKCS8_PRIV_KEY_INFO *p8;

    const PKCS8_PRIV_KEY_INFO *p8c;

    X509 *x509;

    STACK_OF(X509_ATTRIBUTE) *attrs;

    const STACK_OF(X509_ATTRIBUTE) *attrs;

    int ret = 0;



    attrs = PKCS12_SAFEBAG_get0_attrs(bag);
@@ -640,10 +642,10 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass, 
        if (options & NOKEYS)

            return 1;

        print_attribs(out, attrs, "Bag Attributes");

        p8 = PKCS12_SAFEBAG_get0_p8inf(bag);

        if ((pkey = EVP_PKCS82PKEY(p8)) == NULL)

        p8c = PKCS12_SAFEBAG_get0_p8inf(bag);

        if ((pkey = EVP_PKCS82PKEY(p8c)) == NULL)

            return 0;

        print_attribs(out, PKCS8_pkey_get0_attrs(p8), "Key Attributes");

        print_attribs(out, PKCS8_pkey_get0_attrs(p8c), "Key Attributes");

        ret = PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);

        EVP_PKEY_free(pkey);

        break;

crypto/pkcs12/p12_add.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, 
                                   p7->d.encrypted->enc_data->enc_data, 1);

}



PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag,

PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,

                                         const char *pass, int passlen)

{

    return PKCS8_decrypt(bag->value.shkeybag, pass, passlen);
@@ -152,7 +152,7 @@ int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes) 
    return 0;

}



STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12)

STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)

{

    if (!PKCS7_type_is_data(p12->authsafes)) {

        PKCS12err(PKCS12_F_PKCS12_UNPACK_AUTHSAFES,

crypto/pkcs12/p12_attr.c

+3 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, 


char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)

{

    ASN1_TYPE *atype;

    const ASN1_TYPE *atype;



    if ((atype = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName)) == NULL)

        return NULL;
@@ -86,7 +86,8 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) 
                           atype->value.bmpstring->length);

}



STACK_OF(X509_ATTRIBUTE) *PKCS12_SAFEBAG_get0_attrs(PKCS12_SAFEBAG *bag)

const STACK_OF(X509_ATTRIBUTE) *

PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag)

{

    return bag->attrib;

}

crypto/pkcs12/p12_kiss.c

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,

                      EVP_PKEY **pkey, STACK_OF(X509) *ocerts);



static int parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,

static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,

                      int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts);



static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
@@ -157,7 +157,7 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen, 
    return 1;

}



static int parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,

static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,

                      int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts)

{

    int i;
@@ -174,7 +174,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, 
{

    PKCS8_PRIV_KEY_INFO *p8;

    X509 *x509;

    ASN1_TYPE *attrib;

    const ASN1_TYPE *attrib;

    ASN1_BMPSTRING *fname = NULL;

    ASN1_OCTET_STRING *lkid = NULL;

crypto/pkcs12/p12_mutl.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# include <openssl/pkcs12.h>

# include "p12_lcl.h"



int PKCS12_mac_present(PKCS12 *p12)

int PKCS12_mac_present(const PKCS12 *p12)

{

    return p12->mac ? 1 : 0;

}