diff options
author | Rich Salz <rsalz@akamai.com> | 2016-02-18 11:33:21 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-02-18 17:14:50 -0500 |
commit | d63a5e5e7d96f173e2bbf711e3f1f813bf0df05e (patch) | |
tree | 6e7edc889b0c944a4f43c467b9733cc838b046e4 /crypto/camellia | |
parent | 1bd8bc558d7c0b41286d276e62088d7186bd5c34 (diff) | |
download | openssl-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/camellia')
-rw-r--r-- | crypto/camellia/cmll_ecb.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c index d8dfb2bfc5..4edaa6d7a9 100644 --- a/crypto/camellia/cmll_ecb.c +++ b/crypto/camellia/cmll_ecb.c @@ -48,23 +48,12 @@ * */ -#ifndef CAMELLIA_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - #include <openssl/camellia.h> #include "cmll_locl.h" void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAMELLIA_KEY *key, const int enc) { - - assert(in && out && key); - assert((CAMELLIA_ENCRYPT == enc) || (CAMELLIA_DECRYPT == enc)); - if (CAMELLIA_ENCRYPT == enc) Camellia_encrypt(in, out, key); else |