generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix leak properly this time...

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-10-10 14:08:55 +00:00
parent eb47b2fb13
commit 84a75ba38c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crypto/engine/eng_rsax.c
View File

@ -307,12 +307,17 @@ static E_RSAX_MOD_CTX *e_rsax_get_ctx(RSA *rsa, int idx, BIGNUM* m)
static int e_rsax_rsa_finish(RSA *rsa) static int e_rsax_rsa_finish(RSA *rsa)
{ {
E_RSAX_MOD_CTX *hptr = RSA_get_ex_data(rsa, rsax_ex_data_idx); E_RSAX_MOD_CTX *hptr = RSA_get_ex_data(rsa, rsax_ex_data_idx);
if(!hptr) return 0; if(hptr)
{
OPENSSL_free(hptr); OPENSSL_free(hptr);
RSA_set_ex_data(rsa, rsax_ex_data_idx, NULL); RSA_set_ex_data(rsa, rsax_ex_data_idx, NULL);
if (def_rsa_finish) }
def_rsa_finish(rsa); if (rsa->_method_mod_n)
BN_MONT_CTX_free(rsa->_method_mod_n);
if (rsa->_method_mod_p)
BN_MONT_CTX_free(rsa->_method_mod_p);
if (rsa->_method_mod_q)
BN_MONT_CTX_free(rsa->_method_mod_q);
return 1; return 1;
} }
@ -396,7 +401,7 @@ static int mod_exp_pre_compute_data_512(UINT64 *m, struct mod_ctx_512 *data)
/* Some tmps */ /* Some tmps */
UINT64 _t[8]; UINT64 _t[8];
int i, j, ret = 0; int i, j, ret = 0;
CRYPTO_push_info("precomp");
/* Init _m with m */ /* Init _m with m */
BN_init(&_m); BN_init(&_m);
interleaved_array_to_bn_512(&_m, m); interleaved_array_to_bn_512(&_m, m);
@ -480,6 +485,8 @@ err:
BN_free(&tmp2); BN_free(&tmp2);
BN_free(&_m); BN_free(&_m);
CRYPTO_pop_info();
return ret; return ret;
} }
@ -490,7 +497,7 @@ static int e_rsax_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx
BIGNUM local_dmp1,local_dmq1,local_c,local_r1; BIGNUM local_dmp1,local_dmq1,local_c,local_r1;
BIGNUM *dmp1,*dmq1,*c,*pr1; BIGNUM *dmp1,*dmq1,*c,*pr1;
int ret=0; int ret=0;
CRYPTO_push_info("start");
BN_CTX_start(ctx); BN_CTX_start(ctx);
r1 = BN_CTX_get(ctx); r1 = BN_CTX_get(ctx);
m1 = BN_CTX_get(ctx); m1 = BN_CTX_get(ctx);
@ -657,6 +664,7 @@ static int e_rsax_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx
ret=1; ret=1;
err: err:
CRYPTO_pop_info();
BN_CTX_end(ctx); BN_CTX_end(ctx);
return ret; return ret;