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

Remove unnecessary frees and style fixes. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2177)
parent f488976c

crypto/rsa/rsa_ameth.c

+4 −10
Original line number Diff line number Diff line
@@ -44,11 +44,8 @@ static int rsa_param_encode(const EVP_PKEY *pkey, 
        return 1;

    }

    /* Encode PSS parameters */

    if (!ASN1_item_pack(rsa->pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), pstr)) {

        ASN1_STRING_free(*pstr);

        *pstr = NULL;

    if (ASN1_item_pack(rsa->pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), pstr) == NULL)

        return 0;

    }



    *pstrtype = V_ASN1_SEQUENCE;

    return 1;
@@ -493,7 +490,7 @@ static int rsa_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md) 
    /* need to embed algorithm ID inside another */

    if (!rsa_md_to_algor(&algtmp, mgf1md))

        goto err;

    if (!ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp))

    if (ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp) == NULL)

         goto err;

    *palg = X509_ALGOR_new();

    if (*palg == NULL)
@@ -578,15 +575,12 @@ RSA_PSS_PARAMS *rsa_pss_params_create(const EVP_MD *sigmd, 
static ASN1_STRING *rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx)

{

    RSA_PSS_PARAMS *pss = rsa_ctx_to_pss(pkctx);

    ASN1_STRING *os = NULL;

    ASN1_STRING *os;



    if (pss == NULL)

        return NULL;



    if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os)) {

        ASN1_STRING_free(os);

        os = NULL;

    }

    os = ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), NULL);

    RSA_PSS_PARAMS_free(pss);

    return os;

}

crypto/rsa/rsa_pmeth.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ typedef struct { 
static int pkey_rsa_init(EVP_PKEY_CTX *ctx)

{

    RSA_PKEY_CTX *rctx = OPENSSL_zalloc(sizeof(*rctx));



    if (rctx == NULL)

        return 0;

    rctx->nbits = 1024;