summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2002-05-14 19:04:54 +0000
committerBodo Möller <bodo@openssl.org>2002-05-14 19:04:54 +0000
commita385a1aef0025e6b5c59021746674b0514076013 (patch)
treed3411b15fedf5013db9c52c2407097cc80b9a5dc /crypto
parent1126740ddd53a862c1dd43253a5dba325a5d23fe (diff)
make b_print.c consistent with the rest of OpenSSL:
disable assert() except for debug builds
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bio/b_print.c7
-rw-r--r--crypto/bio/bss_bio.c13
2 files changed, 18 insertions, 2 deletions
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index bbd510170b..90011db544 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -56,6 +56,13 @@
* [including the GNU Public Licence.]
*/
+/* disable assert() unless BIO_DEBUG has been defined */
+#ifndef BIO_DEBUG
+# ifndef NDEBUG
+# define NDEBUG
+# endif
+#endif
+
/*
* Stolen from tjh's ssl/ssl_trc.c stuff.
*/
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index d836e3bc3b..27970492a3 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -7,9 +7,18 @@
* for which no specific BIO method is available.
* 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
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
+# ifndef NDEBUG
+# define NDEBUG
+# endif
#endif
#include <assert.h>