diff options
Diffstat (limited to 'src/lib/libcrypto/bn/bn_lib.c')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_lib.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c index 17f4ae89da..f2736e31c3 100644 --- a/src/lib/libcrypto/bn/bn_lib.c +++ b/src/lib/libcrypto/bn/bn_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_lib.c,v 1.36 2016/03/15 20:50:22 krw Exp $ */ | 1 | /* $OpenBSD: bn_lib.c,v 1.37 2017/01/29 17:49:22 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -249,7 +249,7 @@ BN_new(void) | |||
| 249 | BIGNUM *ret; | 249 | BIGNUM *ret; |
| 250 | 250 | ||
| 251 | if ((ret = malloc(sizeof(BIGNUM))) == NULL) { | 251 | if ((ret = malloc(sizeof(BIGNUM))) == NULL) { |
| 252 | BNerr(BN_F_BN_NEW, ERR_R_MALLOC_FAILURE); | 252 | BNerror(ERR_R_MALLOC_FAILURE); |
| 253 | return (NULL); | 253 | return (NULL); |
| 254 | } | 254 | } |
| 255 | ret->flags = BN_FLG_MALLOCED; | 255 | ret->flags = BN_FLG_MALLOCED; |
| @@ -273,17 +273,16 @@ bn_expand_internal(const BIGNUM *b, int words) | |||
| 273 | bn_check_top(b); | 273 | bn_check_top(b); |
| 274 | 274 | ||
| 275 | if (words > (INT_MAX/(4*BN_BITS2))) { | 275 | if (words > (INT_MAX/(4*BN_BITS2))) { |
| 276 | BNerr(BN_F_BN_EXPAND_INTERNAL, BN_R_BIGNUM_TOO_LONG); | 276 | BNerror(BN_R_BIGNUM_TOO_LONG); |
| 277 | return NULL; | 277 | return NULL; |
| 278 | } | 278 | } |
| 279 | if (BN_get_flags(b, BN_FLG_STATIC_DATA)) { | 279 | if (BN_get_flags(b, BN_FLG_STATIC_DATA)) { |
| 280 | BNerr(BN_F_BN_EXPAND_INTERNAL, | 280 | BNerror(BN_R_EXPAND_ON_STATIC_BIGNUM_DATA); |
| 281 | BN_R_EXPAND_ON_STATIC_BIGNUM_DATA); | ||
| 282 | return (NULL); | 281 | return (NULL); |
| 283 | } | 282 | } |
| 284 | a = A = reallocarray(NULL, words, sizeof(BN_ULONG)); | 283 | a = A = reallocarray(NULL, words, sizeof(BN_ULONG)); |
| 285 | if (A == NULL) { | 284 | if (A == NULL) { |
| 286 | BNerr(BN_F_BN_EXPAND_INTERNAL, ERR_R_MALLOC_FAILURE); | 285 | BNerror(ERR_R_MALLOC_FAILURE); |
| 287 | return (NULL); | 286 | return (NULL); |
| 288 | } | 287 | } |
| 289 | #if 1 | 288 | #if 1 |
