[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  ad7c9c9faf8938e17be29cc9afd69d4f0267234c (commit)
      from  f0e1fe7cc30b22d9e24ac38f0d4631f9b8042e12 (commit)


- Log -----------------------------------------------------------------
commit ad7c9c9faf8938e17be29cc9afd69d4f0267234c
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Mar 31 22:09:04 2016 +0200

    Configure: add BLAKE_DEBUG to --strict-warnings set.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure               | 2 +-
 crypto/blake2/blake2b.c | 2 +-
 crypto/blake2/blake2s.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index fdd8820..c1b63e8 100755
--- 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 56b56fb..672210a 100644
--- 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 905a28e..03295c0 100644
--- 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) {