Commit 2c52ac9b authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Call single parent free_comp routine. 



Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 9aa00b18

crypto/ec/ec_lcl.h

+2 −0
Original line number Diff line number Diff line
@@ -308,6 +308,8 @@ NISTP521_PRE_COMP *EC_nistp521_pre_comp_dup(NISTP521_PRE_COMP *); 
NISTZ256_PRE_COMP *EC_nistz256_pre_comp_dup(NISTZ256_PRE_COMP *);

NISTP256_PRE_COMP *EC_nistp256_pre_comp_dup(NISTP256_PRE_COMP *);

EC_PRE_COMP *EC_ec_pre_comp_dup(EC_PRE_COMP *);



void EC_pre_comp_free(EC_GROUP *group);

void EC_nistp224_pre_comp_free(NISTP224_PRE_COMP *);

void EC_nistp256_pre_comp_free(NISTP256_PRE_COMP *);

void EC_nistp521_pre_comp_free(NISTP521_PRE_COMP *);

crypto/ec/ec_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth) 
    return NULL;

}



static void ec_group_free_precomp(EC_GROUP *group)

void EC_pre_comp_free(EC_GROUP *group)

{

    switch (group->pre_comp_type) {

    default:
@@ -145,7 +145,7 @@ void EC_GROUP_free(EC_GROUP *group) 
    if (group->meth->group_finish != 0)

        group->meth->group_finish(group);



    ec_group_free_precomp(group);

    EC_pre_comp_free(group);

    BN_MONT_CTX_free(group->mont_data);

    EC_POINT_free(group->generator);

    BN_free(group->order);
@@ -164,7 +164,7 @@ void EC_GROUP_clear_free(EC_GROUP *group) 
    else if (group->meth->group_finish != 0)

        group->meth->group_finish(group);



    ec_group_free_precomp(group);

    EC_pre_comp_free(group);

    BN_MONT_CTX_free(group->mont_data);

    EC_POINT_clear_free(group->generator);

    BN_clear_free(group->order);

crypto/ec/ec_mult.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx) 
    int ret = 0;



    /* if there is an old EC_PRE_COMP object, throw it away */

    EC_ec_pre_comp_free(group->pre_comp.ec);

    EC_pre_comp_free(group);

    if ((pre_comp = ec_pre_comp_new(group)) == NULL)

        return 0;

crypto/ec/ecp_nistp224.c

+1 −2
Original line number Diff line number Diff line
@@ -1559,8 +1559,7 @@ int ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx) 
    felem tmp_felems[32];



    /* throw away old precomputation */

    EC_nistp224_pre_comp_free(group->pre_comp.nistp224);

    group->pre_comp.nistp224 = NULL;

    EC_pre_comp_free(group);

    if (ctx == NULL)

        if ((ctx = new_ctx = BN_CTX_new()) == NULL)

            return 0;

crypto/ec/ecp_nistp256.c

+1 −2
Original line number Diff line number Diff line
@@ -2184,8 +2184,7 @@ int ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx) 
    felem x_tmp, y_tmp, z_tmp;



    /* throw away old precomputation */

    EC_nistp256_pre_comp_free(group->pre_comp.nistp256);

    group->pre_comp.nistp256 = NULL;

    EC_pre_comp_free(group);

    if (ctx == NULL)

        if ((ctx = new_ctx = BN_CTX_new()) == NULL)

            return 0;