[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  330fad61af7323d5cf786fa76c7b31b4e4cac413 (commit)
      from  968d1a23726dbca82ac694a508efe8ea37d0a95e (commit)


- Log -----------------------------------------------------------------
commit 330fad61af7323d5cf786fa76c7b31b4e4cac413
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Feb 10 00:51:29 2016 -0500

    BIO_PAIR_DEBUG did nothing; remove it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/99-personal-bodo.conf |  2 +-
 crypto/bio/bss_bio.c                 | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Configurations/99-personal-bodo.conf b/Configurations/99-personal-bodo.conf
index d5e3210..78e8e29 100644
--- a/Configurations/99-personal-bodo.conf
+++ b/Configurations/99-personal-bodo.conf
@@ -9,7 +9,7 @@
     "debug-bodo" => {
         inherit_from     => [ "x86_64_asm" ],
         cc               => "gcc",
-        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
+        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
         thread_cflag     => "-D_REENTRANT",
         ex_libs          => "-ldl",
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index ff59780..743a158 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -60,20 +60,6 @@
  * See ssl/ssltest.c for some hints on how this can be used.
  */
 
-/* BIO_DEBUG implies BIO_PAIR_DEBUG */
-#ifdef BIO_DEBUG
-# ifndef BIO_PAIR_DEBUG
-#  define BIO_PAIR_DEBUG
-# endif
-#endif
-
-/* disable assert() unless BIO_PAIR_DEBUG has been defined */
-#ifndef BIO_PAIR_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>