Disable asserts for standard configurations.

diff --git a/Configure b/Configure
index f529c8508102bbb08ebfc187b504538d91c99548..347292fb644f928cafeae509dc6b4e6efa7b87aa 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -97,7 +97,7 @@ my %table=(
 "debug-ben-debug",     "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",
 "debug-ben-strict",    "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
 "debug-ben-debug",     "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",
 "debug-ben-strict",    "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

-"debug-bodo",  "gcc:-DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+"debug-bodo",  "gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

 "dist",                "cc:-O::(unknown):::::",
 
 # Basic configs that should work on any box
 "dist",                "cc:-O::(unknown):::::",
 
 # Basic configs that should work on any box

diff --git a/TABLE b/TABLE
index 901a0fbb175723341acf3b877bd0d624e2897148..183c8ac6ecaeade3f5268a1d8da7cf9562beffe6 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -631,7 +631,7 @@ $rc5_obj      =
 
 *** debug-bodo
 $cc           = gcc
 
 *** debug-bodo
 $cc           = gcc

-$cflags       = -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -m486 -Wall
+$cflags       = -DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -m486 -Wall

 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $lflags       = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $lflags       = 

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index e82b2bc51c5a6150e72823669f01ba4e67d1c975..8c989ba6eaff4485fd0b7c525d6f757222e35b11 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -7,6 +7,10 @@
  * for which no specific BIO method is available.
  * See ssl/ssltest.c for some hints on how this can be used. */
 
  * for which no specific BIO method is available.
  * See ssl/ssltest.c for some hints on how this can be used. */
 

+#ifndef BIO_PAIR_DEBUG
+# define NDEBUG
+#endif
+

 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>