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

Tidy up PKCS12_newpass() fix memory leaks. 



PR#4466

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit d800d0f4)

Conflicts:
	crypto/pkcs12/p12_npas.c
parent 6e216ba6

crypto/pkcs12/p12_npas.c

+43 −50
Original line number Diff line number Diff line
@@ -105,18 +105,19 @@ int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass) 


static int newpass_p12(PKCS12 *p12, char *oldpass, char *newpass)

{

    STACK_OF(PKCS7) *asafes, *newsafes;

    STACK_OF(PKCS12_SAFEBAG) *bags;

    STACK_OF(PKCS7) *asafes = NULL, *newsafes = NULL;

    STACK_OF(PKCS12_SAFEBAG) *bags = NULL;

    int i, bagnid, pbe_nid = 0, pbe_iter = 0, pbe_saltlen = 0;

    PKCS7 *p7, *p7new;

    ASN1_OCTET_STRING *p12_data_tmp = NULL, *macnew = NULL;

    ASN1_OCTET_STRING *p12_data_tmp = NULL;

    unsigned char mac[EVP_MAX_MD_SIZE];

    unsigned int maclen;

    int rv = 0;



    if (!(asafes = PKCS12_unpack_authsafes(p12)))

        return 0;

    if (!(newsafes = sk_PKCS7_new_null()))

        return 0;

    if ((asafes = PKCS12_unpack_authsafes(p12)) == NULL)

        goto err;

    if ((newsafes = sk_PKCS7_new_null()) == NULL)

        goto err;

    for (i = 0; i < sk_PKCS7_num(asafes); i++) {

        p7 = sk_PKCS7_value(asafes, i);

        bagnid = OBJ_obj2nid(p7->type);
@@ -125,63 +126,53 @@ static int newpass_p12(PKCS12 *p12, char *oldpass, char *newpass) 
        } else if (bagnid == NID_pkcs7_encrypted) {

            bags = PKCS12_unpack_p7encdata(p7, oldpass, -1);

            if (!alg_get(p7->d.encrypted->enc_data->algorithm,

                         &pbe_nid, &pbe_iter, &pbe_saltlen)) {

                sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);

                bags = NULL;

            }

        } else

                         &pbe_nid, &pbe_iter, &pbe_saltlen))

                goto err;

        } else {

            continue;

        if (!bags) {

            sk_PKCS7_pop_free(asafes, PKCS7_free);

            return 0;

        }

        if (!newpass_bags(bags, oldpass, newpass)) {

            sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);

            sk_PKCS7_pop_free(asafes, PKCS7_free);

            return 0;

        }

        if (bags == NULL)

            goto err;

        if (!newpass_bags(bags, oldpass, newpass))

            goto err;

        /* Repack bag in same form with new password */

        if (bagnid == NID_pkcs7_data)

            p7new = PKCS12_pack_p7data(bags);

        else

            p7new = PKCS12_pack_p7encdata(pbe_nid, newpass, -1, NULL,

                                          pbe_saltlen, pbe_iter, bags);

        if (!p7new || !sk_PKCS7_push(newsafes, p7new))

            goto err;

        sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);

        if (!p7new) {

            sk_PKCS7_pop_free(asafes, PKCS7_free);

            return 0;

        }

        sk_PKCS7_push(newsafes, p7new);

        bags = NULL;

    }

    sk_PKCS7_pop_free(asafes, PKCS7_free);



    /* Repack safe: save old safe in case of error */



    p12_data_tmp = p12->authsafes->d.data;

    if (!(p12->authsafes->d.data = ASN1_OCTET_STRING_new()))

        goto saferr;

    if ((p12->authsafes->d.data = ASN1_OCTET_STRING_new()) == NULL)

        goto err;

    if (!PKCS12_pack_authsafes(p12, newsafes))

        goto saferr;



        goto err;

    if (!PKCS12_gen_mac(p12, newpass, -1, mac, &maclen))

        goto saferr;

    if (!(macnew = ASN1_OCTET_STRING_new()))

        goto saferr;

    if (!ASN1_OCTET_STRING_set(macnew, mac, maclen))

        goto saferr;

    ASN1_OCTET_STRING_free(p12->mac->dinfo->digest);

    p12->mac->dinfo->digest = macnew;

    ASN1_OCTET_STRING_free(p12_data_tmp);

        goto err;

    if (!ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))

        goto err;



    return 1;

    rv = 1;



 saferr:

    /* Restore old safe */

err:

    /* Restore old safe if necessary */

    if (rv == 1) {

        ASN1_OCTET_STRING_free(p12_data_tmp);

    } else if (p12_data_tmp != NULL) {

        ASN1_OCTET_STRING_free(p12->authsafes->d.data);

    ASN1_OCTET_STRING_free(macnew);

        p12->authsafes->d.data = p12_data_tmp;

    return 0;



    }

    sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);

    sk_PKCS7_pop_free(asafes, PKCS7_free);

    sk_PKCS7_pop_free(newsafes, PKCS7_free);

    return rv;

}



static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, char *oldpass,
@@ -210,8 +201,10 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, char *oldpass, char *newpass) 
        return 0;

    if (!alg_get(bag->value.shkeybag->algor, &p8_nid, &p8_iter, &p8_saltlen))

        return 0;

    if (!(p8new = PKCS8_encrypt(p8_nid, NULL, newpass, -1, NULL, p8_saltlen,

                                p8_iter, p8)))

    p8new = PKCS8_encrypt(p8_nid, NULL, newpass, -1, NULL, p8_saltlen,

                          p8_iter, p8);

    PKCS8_PRIV_KEY_INFO_free(p8);

    if (p8new == NULL)

        return 0;

    X509_SIG_free(bag->value.shkeybag);

    bag->value.shkeybag = p8new;