diff options
Diffstat (limited to 'src/lib/libcrypto/bn/bn_lib.c')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c index 5461e6ee7d..b491c785d4 100644 --- a/src/lib/libcrypto/bn/bn_lib.c +++ b/src/lib/libcrypto/bn/bn_lib.c | |||
| @@ -245,12 +245,12 @@ void BN_clear_free(BIGNUM *a) | |||
| 245 | { | 245 | { |
| 246 | OPENSSL_cleanse(a->d,a->dmax*sizeof(a->d[0])); | 246 | OPENSSL_cleanse(a->d,a->dmax*sizeof(a->d[0])); |
| 247 | if (!(BN_get_flags(a,BN_FLG_STATIC_DATA))) | 247 | if (!(BN_get_flags(a,BN_FLG_STATIC_DATA))) |
| 248 | OPENSSL_free(a->d); | 248 | free(a->d); |
| 249 | } | 249 | } |
| 250 | i=BN_get_flags(a,BN_FLG_MALLOCED); | 250 | i=BN_get_flags(a,BN_FLG_MALLOCED); |
| 251 | OPENSSL_cleanse(a,sizeof(BIGNUM)); | 251 | OPENSSL_cleanse(a,sizeof(BIGNUM)); |
| 252 | if (i) | 252 | if (i) |
| 253 | OPENSSL_free(a); | 253 | free(a); |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | void BN_free(BIGNUM *a) | 256 | void BN_free(BIGNUM *a) |
| @@ -258,9 +258,9 @@ void BN_free(BIGNUM *a) | |||
| 258 | if (a == NULL) return; | 258 | if (a == NULL) return; |
| 259 | bn_check_top(a); | 259 | bn_check_top(a); |
| 260 | if ((a->d != NULL) && !(BN_get_flags(a,BN_FLG_STATIC_DATA))) | 260 | if ((a->d != NULL) && !(BN_get_flags(a,BN_FLG_STATIC_DATA))) |
| 261 | OPENSSL_free(a->d); | 261 | free(a->d); |
| 262 | if (a->flags & BN_FLG_MALLOCED) | 262 | if (a->flags & BN_FLG_MALLOCED) |
| 263 | OPENSSL_free(a); | 263 | free(a); |
| 264 | else | 264 | else |
| 265 | { | 265 | { |
| 266 | #ifndef OPENSSL_NO_DEPRECATED | 266 | #ifndef OPENSSL_NO_DEPRECATED |
| @@ -280,7 +280,7 @@ BIGNUM *BN_new(void) | |||
| 280 | { | 280 | { |
| 281 | BIGNUM *ret; | 281 | BIGNUM *ret; |
| 282 | 282 | ||
| 283 | if ((ret=(BIGNUM *)OPENSSL_malloc(sizeof(BIGNUM))) == NULL) | 283 | if ((ret=(BIGNUM *)malloc(sizeof(BIGNUM))) == NULL) |
| 284 | { | 284 | { |
| 285 | BNerr(BN_F_BN_NEW,ERR_R_MALLOC_FAILURE); | 285 | BNerr(BN_F_BN_NEW,ERR_R_MALLOC_FAILURE); |
| 286 | return(NULL); | 286 | return(NULL); |
| @@ -314,7 +314,7 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) | |||
| 314 | BNerr(BN_F_BN_EXPAND_INTERNAL,BN_R_EXPAND_ON_STATIC_BIGNUM_DATA); | 314 | BNerr(BN_F_BN_EXPAND_INTERNAL,BN_R_EXPAND_ON_STATIC_BIGNUM_DATA); |
| 315 | return(NULL); | 315 | return(NULL); |
| 316 | } | 316 | } |
| 317 | a=A=(BN_ULONG *)OPENSSL_malloc(sizeof(BN_ULONG)*words); | 317 | a=A=(BN_ULONG *)malloc(sizeof(BN_ULONG)*words); |
| 318 | if (A == NULL) | 318 | if (A == NULL) |
| 319 | { | 319 | { |
| 320 | BNerr(BN_F_BN_EXPAND_INTERNAL,ERR_R_MALLOC_FAILURE); | 320 | BNerr(BN_F_BN_EXPAND_INTERNAL,ERR_R_MALLOC_FAILURE); |
| @@ -401,7 +401,7 @@ BIGNUM *bn_dup_expand(const BIGNUM *b, int words) | |||
| 401 | else | 401 | else |
| 402 | { | 402 | { |
| 403 | /* r == NULL, BN_new failure */ | 403 | /* r == NULL, BN_new failure */ |
| 404 | OPENSSL_free(a); | 404 | free(a); |
| 405 | } | 405 | } |
| 406 | } | 406 | } |
| 407 | /* If a == NULL, there was an error in allocation in | 407 | /* If a == NULL, there was an error in allocation in |
| @@ -431,7 +431,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words) | |||
| 431 | { | 431 | { |
| 432 | BN_ULONG *a = bn_expand_internal(b, words); | 432 | BN_ULONG *a = bn_expand_internal(b, words); |
| 433 | if(!a) return NULL; | 433 | if(!a) return NULL; |
| 434 | if(b->d) OPENSSL_free(b->d); | 434 | if(b->d) free(b->d); |
| 435 | b->d=a; | 435 | b->d=a; |
| 436 | b->dmax=words; | 436 | b->dmax=words; |
| 437 | } | 437 | } |
