diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bn/bn_ctx.c | 8 | ||||
-rw-r--r-- | crypto/camellia/cmll_ecb.c | 11 | ||||
-rw-r--r-- | crypto/comp/c_zlib.c | 10 | ||||
-rw-r--r-- | crypto/conf/conf_api.c | 6 | ||||
-rw-r--r-- | crypto/engine/tb_cipher.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_dh.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_digest.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_dsa.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_eckey.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_pkmeth.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_rand.c | 7 | ||||
-rw-r--r-- | crypto/engine/tb_rsa.c | 7 | ||||
-rw-r--r-- | crypto/evp/p5_crpt2.c | 8 | ||||
-rw-r--r-- | crypto/evp/scrypt.c | 10 | ||||
-rw-r--r-- | crypto/modes/cbc128.c | 11 | ||||
-rw-r--r-- | crypto/modes/ccm128.c | 7 | ||||
-rw-r--r-- | crypto/modes/cfb128.c | 15 | ||||
-rw-r--r-- | crypto/modes/ctr128.c | 13 | ||||
-rw-r--r-- | crypto/modes/cts128.c | 23 | ||||
-rw-r--r-- | crypto/modes/gcm128.c | 7 | ||||
-rw-r--r-- | crypto/modes/ofb128.c | 9 | ||||
-rw-r--r-- | crypto/modes/xts128.c | 7 | ||||
-rw-r--r-- | crypto/pkcs12/p12_decr.c | 4 | ||||
-rw-r--r-- | crypto/pkcs12/p12_key.c | 12 | ||||
-rw-r--r-- | crypto/rand/md_rand.c | 10 | ||||
-rw-r--r-- | crypto/rsa/rsa_sign.c | 5 |
26 files changed, 12 insertions, 220 deletions
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c index 88f5ac814f..700234be6f 100644 --- a/crypto/bn/bn_ctx.c +++ b/crypto/bn/bn_ctx.c @@ -53,14 +53,6 @@ * */ -#if !defined(BN_CTX_DEBUG) && !defined(BN_DEBUG) -# ifndef NDEBUG -# define NDEBUG -# endif -#endif - -#include <assert.h> - #include "internal/cryptlib.h" #include "bn_lcl.h" 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 diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index baad9c66ee..c78bbcfde8 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -224,11 +224,6 @@ static int zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out, err = deflate(&state->ostream, Z_SYNC_FLUSH); if (err != Z_OK) return -1; -# ifdef DEBUG_ZLIB - fprintf(stderr, "compress(%4d)->%4d %s\n", - ilen, olen - state->ostream.avail_out, - (ilen != olen - state->ostream.avail_out) ? "zlib" : "clear"); -# endif return olen - state->ostream.avail_out; } @@ -250,11 +245,6 @@ static int zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out, err = inflate(&state->istream, Z_SYNC_FLUSH); if (err != Z_OK) return -1; -# ifdef DEBUG_ZLIB - fprintf(stderr, "expand(%4d)->%4d %s\n", - ilen, olen - state->istream.avail_out, - (ilen != olen - state->istream.avail_out) ? "zlib" : "clear"); -# endif return olen - state->istream.avail_out; } 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> diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c index fcfb2efd8f..7df01caf12 100644 --- a/crypto/engine/tb_cipher.c +++ b/crypto/engine/tb_cipher.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_cipher_engine(), the function - * that is used by EVP to hook in cipher code and cache defaults (etc), will - * display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_CIPHER_DEBUG */ - static ENGINE_TABLE *cipher_table = NULL; void ENGINE_unregister_ciphers(ENGINE *e) diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c index 8114afa63a..4f68975ba5 100644 --- a/crypto/engine/tb_dh.c +++ b/crypto/engine/tb_dh.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_default_DH(), the function that - * is used by DH to hook in implementation code and cache defaults (etc), - * will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_DH_DEBUG */ - static ENGINE_TABLE *dh_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c index de1ad9c01b..03096b30fa 100644 --- a/crypto/engine/tb_digest.c +++ b/crypto/engine/tb_digest.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_digest_engine(), the function - * that is used by EVP to hook in digest code and cache defaults (etc), will - * display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_DIGEST_DEBUG */ - static ENGINE_TABLE *digest_table = NULL; void ENGINE_unregister_digests(ENGINE *e) diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c index c1f57f146c..adfb11fe37 100644 --- a/crypto/engine/tb_dsa.c +++ b/crypto/engine/tb_dsa.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_default_DSA(), the function that - * is used by DSA to hook in implementation code and cache defaults (etc), - * will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_DSA_DEBUG */ - static ENGINE_TABLE *dsa_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c index dbb41396c9..7c05c01d10 100644 --- a/crypto/engine/tb_eckey.c +++ b/crypto/engine/tb_eckey.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_default_EC_KEY(), the function that - * is used by EC_KEY to hook in implementation code and cache defaults (etc), - * will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_EC_KEY_DEBUG */ - static ENGINE_TABLE *dh_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c index 29e65be1ad..947e139e2f 100644 --- a/crypto/engine/tb_pkmeth.c +++ b/crypto/engine/tb_pkmeth.c @@ -55,13 +55,6 @@ #include "eng_int.h" #include <openssl/evp.h> -/* - * If this symbol is defined then ENGINE_get_pkey_meth_engine(), the function - * that is used by EVP to hook in pkey_meth code and cache defaults (etc), - * will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_PKEY_METH_DEBUG */ - static ENGINE_TABLE *pkey_meth_table = NULL; void ENGINE_unregister_pkey_meths(ENGINE *e) diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c index a522264d04..b67cff54f5 100644 --- a/crypto/engine/tb_rand.c +++ b/crypto/engine/tb_rand.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_default_RAND(), the function - * that is used by RAND to hook in implementation code and cache defaults - * (etc), will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_RAND_DEBUG */ - static ENGINE_TABLE *rand_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c index 2790a82192..4405d678f3 100644 --- a/crypto/engine/tb_rsa.c +++ b/crypto/engine/tb_rsa.c @@ -54,13 +54,6 @@ #include "eng_int.h" -/* - * If this symbol is defined then ENGINE_get_default_RSA(), the function that - * is used by RSA to hook in implementation code and cache defaults (etc), - * will display brief debugging summaries to stderr with the 'nid'. - */ -/* #define ENGINE_RSA_DEBUG */ - static ENGINE_TABLE *rsa_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index b9ff5de07a..76dcf02ad1 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -64,9 +64,9 @@ # include "evp_locl.h" /* set this to print out info about the keygen algorithm */ -/* #define DEBUG_PKCS5V2 */ +/* #define OPENSSL_DEBUG_PKCS5V2 */ -# ifdef DEBUG_PKCS5V2 +# ifdef OPENSSL_DEBUG_PKCS5V2 static void h__dump(const unsigned char *p, int len); # endif @@ -157,7 +157,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, } HMAC_CTX_free(hctx); HMAC_CTX_free(hctx_tpl); -# ifdef DEBUG_PKCS5V2 +# ifdef OPENSSL_DEBUG_PKCS5V2 fprintf(stderr, "Password:\n"); h__dump(pass, passlen); fprintf(stderr, "Salt:\n"); @@ -315,7 +315,7 @@ int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, return rv; } -# ifdef DEBUG_PKCS5V2 +# ifdef OPENSSL_DEBUG_PKCS5V2 static void h__dump(const unsigned char *p, int len) { for (; len--; p++) diff --git a/crypto/evp/scrypt.c b/crypto/evp/scrypt.c index 20e5dd4854..f9b368b365 100644 --- a/crypto/evp/scrypt.c +++ b/crypto/evp/scrypt.c @@ -290,16 +290,6 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, keylen, key) == 0) goto err; rv = 1; -#ifdef SCRYPT_DEBUG - fprintf(stderr, "scrypt parameters:\n"); - fprintf(stderr, "N=%lu, p=%lu, r=%lu\n", N, p, r); - fprintf(stderr, "Salt:\n"); - BIO_dump_fp(stderr, (char *)salt, saltlen); - fprintf(stderr, "Password:\n"); - BIO_dump_fp(stderr, (char *)pass, passlen); - fprintf(stderr, "Key:\n"); - BIO_dump_fp(stderr, (char *)key, keylen); -#endif err: OPENSSL_clear_free(B, allocsize); return rv; diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c index c13caea535..bf2210c39e 100644 --- a/crypto/modes/cbc128.c +++ b/crypto/modes/cbc128.c @@ -52,13 +52,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - #if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC) # define STRICT_ALIGNMENT 0 #endif @@ -70,8 +63,6 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out, size_t n; const unsigned char *iv = ivec; - assert(in && out && key && ivec); - #if !defined(OPENSSL_SMALL_FOOTPRINT) if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) { @@ -123,8 +114,6 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out, unsigned char c[16]; } tmp; - assert(in && out && key && ivec); - #if !defined(OPENSSL_SMALL_FOOTPRINT) if (in != out) { const unsigned char *iv = ivec; diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c index c1ded0f914..ef99eb15d5 100644 --- a/crypto/modes/ccm128.c +++ b/crypto/modes/ccm128.c @@ -51,13 +51,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - /* * First you setup M and L parameters and pass the key schedule. This is * called once per session setup... diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c index c4395bcab5..8d3af57b77 100644 --- a/crypto/modes/cfb128.c +++ b/crypto/modes/cfb128.c @@ -52,13 +52,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - /* * The input and output encrypted as though 128bit cfb mode is being used. * The extra state information to record how much of the 128bit block we have @@ -72,8 +65,6 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, unsigned int n; size_t l = 0; - assert(in && out && key && ivec && num); - n = *num; if (enc) { @@ -228,9 +219,6 @@ void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out, size_t n; unsigned char c[1], d[1]; - assert(in && out && key && ivec && num); - assert(*num == 0); - for (n = 0; n < bits; ++n) { c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; cfbr_encrypt_block(c, d, 1, key, ivec, enc, block); @@ -246,9 +234,6 @@ void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out, { size_t n; - assert(in && out && key && ivec && num); - assert(*num == 0); - for (n = 0; n < length; ++n) cfbr_encrypt_block(&in[n], &out[n], 8, key, ivec, enc, block); } diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c index 4397494efb..5bdbbcf764 100644 --- a/crypto/modes/ctr128.c +++ b/crypto/modes/ctr128.c @@ -52,13 +52,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - /* * NOTE: the IV/counter CTR mode is big-endian. The code itself is * endian-neutral. @@ -125,9 +118,6 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out, unsigned int n; size_t l = 0; - assert(in && out && key && ecount_buf && num); - assert(*num < 16); - n = *num; #if !defined(OPENSSL_SMALL_FOOTPRINT) @@ -203,9 +193,6 @@ void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out, { unsigned int n, ctr32; - assert(in && out && key && ecount_buf && num); - assert(*num < 16); - n = *num; while (n && len) { diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c index 137be595a1..ed233d5d79 100644 --- a/crypto/modes/cts128.c +++ b/crypto/modes/cts128.c @@ -9,13 +9,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - /* * Trouble with Ciphertext Stealing, CTS, mode is that there is no * common official specification, but couple of cipher/application @@ -36,8 +29,6 @@ size_t CRYPTO_cts128_encrypt_block(const unsigned char *in, { size_t residue, n; - assert(in && out && key && ivec); - if (len <= 16) return 0; @@ -68,8 +59,6 @@ size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in, { size_t residue, n; - assert(in && out && key && ivec); - if (len < 16) return 0; @@ -103,8 +92,6 @@ size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out, unsigned char c[16]; } tmp; - assert(in && out && key && ivec); - if (len <= 16) return 0; @@ -141,8 +128,6 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out, unsigned char c[16]; } tmp; - assert(in && out && key && ivec); - if (len < 16) return 0; @@ -179,8 +164,6 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in, unsigned char c[32]; } tmp; - assert(in && out && key && ivec); - if (len <= 16) return 0; @@ -224,8 +207,6 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in, unsigned char c[32]; } tmp; - assert(in && out && key && ivec); - if (len < 16) return 0; @@ -272,8 +253,6 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out, unsigned char c[32]; } tmp; - assert(in && out && key && ivec); - if (len <= 16) return 0; @@ -314,8 +293,6 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out, unsigned char c[32]; } tmp; - assert(in && out && key && ivec); - if (len < 16) return 0; diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c index 0615224dd0..8a8b110268 100644 --- a/crypto/modes/gcm128.c +++ b/crypto/modes/gcm128.c @@ -51,13 +51,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - #if defined(BSWAP4) && defined(STRICT_ALIGNMENT) /* redefine, because alignment is ensured */ # undef GETU32 diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c index 4dbaccd7a6..0870f08aed 100644 --- a/crypto/modes/ofb128.c +++ b/crypto/modes/ofb128.c @@ -52,13 +52,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - /* * The input and output encrypted as though 128bit ofb mode is being used. * The extra state information to record how much of the 128bit block we have @@ -71,8 +64,6 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, unsigned int n; size_t l = 0; - assert(in && out && key && ivec && num); - n = *num; #if !defined(OPENSSL_SMALL_FOOTPRINT) diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c index 8f2af588b2..55fa654478 100644 --- a/crypto/modes/xts128.c +++ b/crypto/modes/xts128.c @@ -51,13 +51,6 @@ #include "modes_lcl.h" #include <string.h> -#ifndef MODES_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], const unsigned char *inp, unsigned char *out, diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 953d938742..2a89a4894e 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -62,7 +62,7 @@ /* Define this to dump decrypted output to files called DERnnn */ /* - * #define DEBUG_DECRYPT + * #define OPENSSL_DEBUG_DECRYPT */ /* @@ -144,7 +144,7 @@ void *PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, return NULL; } p = out; -#ifdef DEBUG_DECRYPT +#ifdef OPENSSL_DEBUG_DECRYPT { FILE *op; diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 4256452cd2..6a9a3254b1 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -63,9 +63,9 @@ /* Uncomment out this line to get debugging info about key generation */ /* - * #define DEBUG_KEYGEN + * #define OPENSSL_DEBUG_KEYGEN */ -#ifdef DEBUG_KEYGEN +#ifdef OPENSSL_DEBUG_KEYGEN # include <openssl/bio.h> extern BIO *bio_err; void h__dump(unsigned char *p, int len); @@ -109,7 +109,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int ret = 0; BIGNUM *Ij = NULL, *Bpl1 = NULL; /* These hold Ij and B + 1 */ EVP_MD_CTX *ctx = NULL; -#ifdef DEBUG_KEYGEN +#ifdef OPENSSL_DEBUG_KEYGEN unsigned char *tmpout = out; int tmpn = n; #endif @@ -118,7 +118,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, if (ctx == NULL) goto err; -#ifdef DEBUG_KEYGEN +#ifdef OPENSSL_DEBUG_KEYGEN fprintf(stderr, "KEYGEN DEBUG\n"); fprintf(stderr, "ID %d, ITER %d\n", id, iter); fprintf(stderr, "Password (length %d):\n", passlen); @@ -166,7 +166,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, } memcpy(out, Ai, min(n, u)); if (u >= n) { -#ifdef DEBUG_KEYGEN +#ifdef OPENSSL_DEBUG_KEYGEN fprintf(stderr, "Output KEY (length %d)\n", tmpn); h__dump(tmpout, tmpn); #endif @@ -221,7 +221,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, return ret; } -#ifdef DEBUG_KEYGEN +#ifdef OPENSSL_DEBUG_KEYGEN void h__dump(unsigned char *p, int len) { for (; len--; p++) diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index c7be2783da..fa36918760 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -108,13 +108,6 @@ * */ -#ifdef MD_RAND_DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -#endif - -#include <assert.h> #include <stdio.h> #include <string.h> @@ -350,9 +343,6 @@ static int rand_add(const void *buf, int num, double add) if (!do_not_lock) CRYPTO_w_unlock(CRYPTO_LOCK_RAND); -#if !defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) - assert(md_c[1] == md_count[1]); -#endif rv = 1; err: EVP_MD_CTX_free(m); diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c index 7c9c528ff4..61f91b9856 100644 --- a/crypto/rsa/rsa_sign.c +++ b/crypto/rsa/rsa_sign.c @@ -235,11 +235,6 @@ int int_rsa_verify(int dtype, const unsigned char *m, sigtype = OBJ_obj2nid(sig->algor->algorithm); -#ifdef RSA_DEBUG - /* put a backward compatibility flag in EAY */ - fprintf(stderr, "in(%s) expect(%s)\n", OBJ_nid2ln(sigtype), - OBJ_nid2ln(dtype)); -#endif if (sigtype != dtype) { RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_ALGORITHM_MISMATCH); goto err; |