diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-21 15:52:52 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-21 08:44:44 +0100 |
| commit | 437e5050d585ede90301ddeee1532e22064e63eb (patch) | |
| tree | b9c3360afcce90523c450f2cef510a8a9fd50e81 | |
| parent | 86f31dd9cc81d1c2429846ab663ecd8a29333e3b (diff) | |
| download | openssl-437e5050d585ede90301ddeee1532e22064e63eb.tar.gz | |
Remove OPENSSL_assert() usage from crypto/bn
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3740)
| -rw-r--r-- | crypto/bn/bn_lcl.h | 10 | ||||
| -rw-r--r-- | crypto/bn/bn_nist.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 7828232540..9171879520 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -145,7 +145,7 @@ extern "C" { */ # ifdef BN_DEBUG - +# include <assert.h> # ifdef BN_DEBUG_RAND # define bn_pollute(a) \ do { \ @@ -169,8 +169,8 @@ extern "C" { do { \ const BIGNUM *_bnum2 = (a); \ if (_bnum2 != NULL) { \ - OPENSSL_assert(((_bnum2->top == 0) && !_bnum2->neg) || \ - (_bnum2->top && (_bnum2->d[_bnum2->top - 1] != 0))); \ + assert(((_bnum2->top == 0) && !_bnum2->neg) || \ + (_bnum2->top && (_bnum2->d[_bnum2->top - 1] != 0))); \ bn_pollute(_bnum2); \ } \ } while(0) @@ -181,8 +181,8 @@ extern "C" { # define bn_wcheck_size(bn, words) \ do { \ const BIGNUM *_bnum2 = (bn); \ - OPENSSL_assert((words) <= (_bnum2)->dmax && \ - (words) >= (_bnum2)->top); \ + assert((words) <= (_bnum2)->dmax && \ + (words) >= (_bnum2)->top); \ /* avoid unused variable warning with NDEBUG */ \ (void)(_bnum2); \ } while(0) diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c index 53598f97ef..fcc2b77f45 100644 --- a/crypto/bn/bn_nist.c +++ b/crypto/bn/bn_nist.c @@ -254,7 +254,7 @@ static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max) int i; #ifdef BN_DEBUG - OPENSSL_assert(top <= max); + assert(top <= max); #endif for (i = 0; i < top; i++) dst[i] = src[i]; |