summaryrefslogtreecommitdiff
path: root/crypto/conf
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-02-18 11:33:21 -0500
committerRich Salz <rsalz@openssl.org>2016-02-18 17:14:50 -0500
commitd63a5e5e7d96f173e2bbf711e3f1f813bf0df05e (patch)
tree6e7edc889b0c944a4f43c467b9733cc838b046e4 /crypto/conf
parent1bd8bc558d7c0b41286d276e62088d7186bd5c34 (diff)
downloadopenssl-new-d63a5e5e7d96f173e2bbf711e3f1f813bf0df05e.tar.gz
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings. Remove comments about outdated debugging ifdef guards. Remove md_rand ifdef guarding an assert; it doesn't seem used. Remove the conf guards in conf_api since we use OPENSSL_assert, not assert. For pkcs12 stuff put OPENSSL_ in front of the macro name. Merge TLS_DEBUG into SSL_DEBUG. Various things just turned on/off asserts, mainly for checking non-NULL arguments, which is now removed: camellia, bn_ctx, crypto/modes. Remove some old debug code, that basically just printed things to stderr: DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG, RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG. Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf_api.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 78e932e3d7..5365c97e78 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -57,12 +57,6 @@
/* Part of the code in here was originally in conf.c, which is now removed */
-#ifndef CONF_DEBUG
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
-#endif
-
-#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <openssl/conf.h>