QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 19:24:37 +00:00
Code Issues Projects Releases Wiki Activity

Added NULL check to BN_clear() & BN_CTX_end()

Browse Source 
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8518)
This commit is contained in:
Shane Lontis 2019-03-19 09:58:09 +10:00 committed by Richard Levitte
parent 226f2bf191
commit ce1415ed2c
16 changed files with 31 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bn/bn_ctx.c
View File

@ -184,6 +184,8 @@ void BN_CTX_start(BN_CTX *ctx)
void BN_CTX_end(BN_CTX *ctx) void BN_CTX_end(BN_CTX *ctx)
{ {
if (ctx == NULL)
return;
CTXDBG("ENTER BN_CTX_end()", ctx); CTXDBG("ENTER BN_CTX_end()", ctx);
if (ctx->err_stack) if (ctx->err_stack)
ctx->err_stack--; ctx->err_stack--;

2
crypto/bn/bn_lib.c
View File

@ -338,6 +338,8 @@ void BN_swap(BIGNUM *a, BIGNUM *b)
void BN_clear(BIGNUM *a) void BN_clear(BIGNUM *a)
{ {
if (a == NULL)
return;
bn_check_top(a); bn_check_top(a);
if (a->d != NULL) if (a->d != NULL)
OPENSSL_cleanse(a->d, sizeof(*a->d) * a->dmax); OPENSSL_cleanse(a->d, sizeof(*a->d) * a->dmax);

3
crypto/bn/bn_prime.c
View File

@ -170,8 +170,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,
found = 1; found = 1;
err: err:
OPENSSL_free(mods); OPENSSL_free(mods);
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
bn_check_top(ret); bn_check_top(ret);
return found; return found;

18
crypto/dh/dh_check.c
View File

@ -58,10 +58,8 @@ int DH_check_params(const DH *dh, int *ret)
ok = 1; ok = 1;
err: err:
if (ctx != NULL) { BN_CTX_end(ctx);
BN_CTX_end(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx);
}
return ok; return ok;
} }
@ -171,10 +169,8 @@ int DH_check(const DH *dh, int *ret)
} }
ok = 1; ok = 1;
err: err:
if (ctx != NULL) { BN_CTX_end(ctx);
BN_CTX_end(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx);
}
return ok; return ok;
} }
@ -225,9 +221,7 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
ok = 1; ok = 1;
err: err:
if (ctx != NULL) { BN_CTX_end(ctx);
BN_CTX_end(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx);
}
return ok; return ok;
} }

6
crypto/dh/dh_gen.c
View File

@ -122,9 +122,7 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
ok = 0; ok = 0;
} }
if (ctx != NULL) { BN_CTX_end(ctx);
BN_CTX_end(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx);
}
return ok; return ok;
} }

6
crypto/dh/dh_key.c
View File

@ -205,10 +205,8 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
ret = BN_bn2bin(tmp, key); ret = BN_bn2bin(tmp, key);
err: err:
if (ctx != NULL) { BN_CTX_end(ctx);
BN_CTX_end(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx);
}
return ret; return ret;
} }

6
crypto/dsa/dsa_gen.c
View File

@ -292,8 +292,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
if (seed_out) if (seed_out)
memcpy(seed_out, seed, qsize); memcpy(seed_out, seed, qsize);
} }
if (ctx) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
BN_MONT_CTX_free(mont); BN_MONT_CTX_free(mont);
return ok; return ok;
@ -607,8 +606,7 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
OPENSSL_free(seed); OPENSSL_free(seed);
if (seed_out != seed_tmp) if (seed_out != seed_tmp)
OPENSSL_free(seed_tmp); OPENSSL_free(seed_tmp);
if (ctx) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
BN_MONT_CTX_free(mont); BN_MONT_CTX_free(mont);
EVP_MD_CTX_free(mctx); EVP_MD_CTX_free(mctx);

3
crypto/ec/ec2_smpl.c
View File

@ -204,8 +204,7 @@ int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group,
ret = 1; ret = 1;
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
return ret; return ret;
} }

3
crypto/ec/ec_lib.c
View File

@ -1079,8 +1079,7 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
ret = 1; ret = 1;
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
return ret; return ret;
} }

3
crypto/ec/ec_mult.c
View File

@ -948,8 +948,7 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
ret = 1; ret = 1;
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
EC_ec_pre_comp_free(pre_comp); EC_ec_pre_comp_free(pre_comp);
if (points) { if (points) {

3
crypto/ec/ecdh_ossl.c
View File

@ -113,8 +113,7 @@ int ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
err: err:
EC_POINT_clear_free(tmp); EC_POINT_clear_free(tmp);
if (ctx) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
OPENSSL_free(buf); OPENSSL_free(buf);
return ret; return ret;

3
crypto/ec/ecp_nistz256.c
View File

@ -888,8 +888,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
ret = 1; ret = 1;
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
EC_nistz256_pre_comp_free(pre_comp); EC_nistz256_pre_comp_free(pre_comp);

6
crypto/ec/ecp_smpl.c
View File

@ -307,8 +307,7 @@ int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
ret = 1; ret = 1;
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
return ret; return ret;
} }
@ -787,8 +786,7 @@ int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
ret = 1; ret = 1;
end: end:
if (ctx) /* otherwise we already called BN_CTX_end */ BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(new_ctx); BN_CTX_free(new_ctx);
return ret; return ret;
} }

3
crypto/rsa/rsa_gen.c
View File

@ -393,8 +393,7 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, int primes, BIGNUM *e_value,
RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, ERR_LIB_BN); RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, ERR_LIB_BN);
ok = 0; ok = 0;
} }
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
return ok; return ok;
#endif /* FIPS_MODE */ #endif /* FIPS_MODE */

12
crypto/rsa/rsa_ossl.c
View File

@ -148,8 +148,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
*/ */
r = BN_bn2binpad(ret, to, num); r = BN_bn2binpad(ret, to, num);
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num); OPENSSL_clear_free(buf, num);
return r; return r;
@ -354,8 +353,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
*/ */
r = BN_bn2binpad(res, to, num); r = BN_bn2binpad(res, to, num);
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num); OPENSSL_clear_free(buf, num);
return r; return r;
@ -484,8 +482,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
err_clear_last_constant_time(r >= 0); err_clear_last_constant_time(r >= 0);
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num); OPENSSL_clear_free(buf, num);
return r; return r;
@ -581,8 +578,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
RSAerr(RSA_F_RSA_OSSL_PUBLIC_DECRYPT, RSA_R_PADDING_CHECK_FAILED); RSAerr(RSA_F_RSA_OSSL_PUBLIC_DECRYPT, RSA_R_PADDING_CHECK_FAILED);
err: err:
if (ctx != NULL) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
OPENSSL_clear_free(buf, num); OPENSSL_clear_free(buf, num);
return r; return r;

6
crypto/rsa/rsa_x931g.c
View File

@ -133,8 +133,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
ret = 1; ret = 1;
err: err:
if (ctx) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
BN_CTX_free(ctx2); BN_CTX_free(ctx2);
@ -188,8 +187,7 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
ok = 1; ok = 1;
error: error:
if (ctx) BN_CTX_end(ctx);
BN_CTX_end(ctx);
BN_CTX_free(ctx); BN_CTX_free(ctx);
if (ok) if (ok)