summaryrefslogtreecommitdiffstats
path: root/crypto/bio
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2002-05-14 19:40:58 +0000
committerBodo Möller <bodo@openssl.org>2002-05-14 19:40:58 +0000
commit60e5f36d277b5b03d93e56f9893dd7ef6d3f75f0 (patch)
tree4b906ddeb9312f44fe414345ed550cbd466778b3 /crypto/bio
parent2469361c0ff9e29daac521d061361b1a579edfaf (diff)
make b_print.c consistent with the rest of OpenSSL:
disable assert() except for debug builds
Diffstat (limited to 'crypto/bio')
-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 7c3c9bdf69..3ce1290772 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 a5da473031..1c485a4479 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>