Configure: add BLAKE_DEBUG to --strict-warnings set.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configure b/Configure
index fdd88208b6a8da30c642cac1f10110cba4bebdd5..c1b63e8933a627d383ed21bc224673ab5c6a9a07 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -77,7 +77,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lx
 # Minimum warning options... any contributions to OpenSSL should at least get
 # past these.
 
-my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED -DBIO_DEBUG"
+my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED -DBIO_DEBUG -DBLAKE_DEBUG"
         . " -pedantic"
         . " -Wall"
         . " -Wno-long-long"

diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.c
index 56b56fb2ef98e2d1eefa81696ee43f22395248b1..672210a751fc930676ca3551458f4cb2475161c7 100644 (file)
--- a/crypto/blake2/blake2b.c
+++ b/crypto/blake2/blake2b.c
@@ -78,7 +78,7 @@ static void blake2b_init_param(BLAKE2B_CTX *S, const BLAKE2B_PARAM *P)
 
     /* The param struct is carefully hand packed, and should be 64 bytes on
      * every platform. */
-    OPENSSL_assert(sizeof(BLAKE2B_PARAM) == 64);
+    assert(sizeof(BLAKE2B_PARAM) == 64);
     /* IV XOR ParamBlock */
     for (i = 0; i < 8; ++i) {
         S->h[i] ^= load64(p + sizeof(S->h[i]) * i);

diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c
index 905a28eaf7810784d0dd7f39ff1c47ef32ab5e4f..03295c08b6e656cc57b6f0f3ecdfe82a9acb84ec 100644 (file)
--- a/crypto/blake2/blake2s.c
+++ b/crypto/blake2/blake2s.c
@@ -73,7 +73,7 @@ static void blake2s_init_param(BLAKE2S_CTX *S, const BLAKE2S_PARAM *P)
 
     /* The param struct is carefully hand packed, and should be 32 bytes on
      * every platform. */
-    OPENSSL_assert(sizeof(BLAKE2S_PARAM) == 32);
+    assert(sizeof(BLAKE2S_PARAM) == 32);
     blake2s_init0(S);
     /* IV XOR ParamBlock */
     for (i = 0; i < 8; ++i) {