Commit 8fdc3734 authored by Rich Salz's avatar Rich Salz
Browse files

free NULL cleanup. 



This gets EC_GROUP_clear_free EC_GROUP_free, EC_KEY_free,
EC_POINT_clear_free, EC_POINT_free

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 17dd65e6

apps/ec.c

+1 −2
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ int MAIN(int argc, char **argv) 
 end:

    BIO_free(in);

    BIO_free_all(out);

    if (eckey)

    EC_KEY_free(eckey);

    if (passin)

        OPENSSL_free(passin);

apps/ecparam.c

+1 −2
Original line number Diff line number Diff line
@@ -623,7 +623,6 @@ int MAIN(int argc, char **argv) 
        OPENSSL_free(buffer);

    BIO_free(in);

    BIO_free_all(out);

    if (group != NULL)

    EC_GROUP_free(group);

    apps_shutdown();

    OPENSSL_EXIT(ret);

apps/speed.c

+3 −6
Original line number Diff line number Diff line
@@ -2457,12 +2457,9 @@ int MAIN(int argc, char **argv) 


#ifndef OPENSSL_NO_EC

    for (i = 0; i < EC_NUM; i++)

        if (ecdsa[i] != NULL)

        EC_KEY_free(ecdsa[i]);

    for (i = 0; i < EC_NUM; i++) {

        if (ecdh_a[i] != NULL)

        EC_KEY_free(ecdh_a[i]);

        if (ecdh_b[i] != NULL)

        EC_KEY_free(ecdh_b[i]);

    }

#endif

crypto/ec/ec2_mult.c

+2 −4
Original line number Diff line number Diff line
@@ -437,9 +437,7 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, 
    ret = 1;



 err:

    if (p)

    EC_POINT_free(p);

    if (acc)

    EC_POINT_free(acc);

    if (new_ctx != NULL)

        BN_CTX_free(new_ctx);

crypto/ec/ec_ameth.c

+4 −8
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static EC_KEY *eckey_type2param(int ptype, void *pval) 
    return eckey;



 ecerr:

    if (eckey)

    EC_KEY_free(eckey);

    return NULL;

}
@@ -210,7 +209,6 @@ static int eckey_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) 
    return 1;



 ecerr:

    if (eckey)

    EC_KEY_free(eckey);

    return 0;

}
@@ -292,7 +290,6 @@ static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) 
 ecliberr:

    ECerr(EC_F_ECKEY_PRIV_DECODE, ERR_R_EC_LIB);

 ecerr:

    if (eckey)

    EC_KEY_free(eckey);

    return 0;

}
@@ -706,7 +703,6 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx, 
    if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)

        rv = 1;

 err:

    if (ecpeer)

    EC_KEY_free(ecpeer);

    if (pkpeer)

        EVP_PKEY_free(pkpeer);