From 5d1c09de1f2736e1d4b1877206d08455ec75f558 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 12 Jul 2018 19:15:26 +0200 Subject: [PATCH] bn/bn_lcl.h,bn_nist.c: addres strict warnings with -DBN_DEBUG. Reviewed-by: Rich Salz --- crypto/bn/bn_lcl.h | 9 ++++----- crypto/bn/bn_nist.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 0d3a8bfd5d..d74b590841 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -151,7 +151,6 @@ * all operations manipulating the bit in question in non-BN_DEBUG build. */ # define BN_FLG_FIXED_TOP 0x10000 -# include # ifdef BN_DEBUG_RAND # define bn_pollute(a) \ do { \ @@ -175,10 +174,10 @@ do { \ const BIGNUM *_bnum2 = (a); \ if (_bnum2 != NULL) { \ - int top = _bnum2->top; \ - assert((top == 0 && !_bnum2->neg) || \ - (top && ((_bnum2->flags & BN_FLG_FIXED_TOP) \ - || _bnum2->d[top - 1] != 0))); \ + int _top = _bnum2->top; \ + (void)ossl_assert((_top == 0 && !_bnum2->neg) || \ + (_top && ((_bnum2->flags & BN_FLG_FIXED_TOP) \ + || _bnum2->d[_top - 1] != 0))); \ bn_pollute(_bnum2); \ } \ } while(0) diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c index fcc2b77f45..4d71afda7e 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 - assert(top <= max); + (void)ossl_assert(top <= max); #endif for (i = 0; i < top; i++) dst[i] = src[i]; -- 2.25.1