From 20aefbf0b86724bbf87cb9ceb36defa64e4691ab Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 25 May 2014 16:23:10 +0000
Subject: Remove TLS_DEBUG, SSL_DEBUG, CIPHER_DEBUG and OPENSSL_RI_DEBUG. Much
 of this is sporadic, hacked up and can easily be put back in an improved form
 should we ever need it.

ok miod@
---
 src/lib/libssl/ssl_ciph.c | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/lib/libssl/ssl_ciph.c')

diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 22ed70b30b..6b650ccea3 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -906,10 +906,6 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey,
 	const SSL_CIPHER *cp;
 	int reverse = 0;
 
-#ifdef CIPHER_DEBUG
-	printf("Applying rule %d with %08lx/%08lx/%08lx/%08lx/%08lx %08lx (%d)\n",
-	rule, alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, algo_strength, strength_bits);
-#endif
 
 	if (rule == CIPHER_DEL)
 		reverse = 1; /* needed to maintain sorting between currently deleted ciphers */
@@ -942,9 +938,6 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey,
 			if (strength_bits != cp->strength_bits)
 				continue;
 		} else {
-#ifdef CIPHER_DEBUG
-			printf("\nName: %s:\nAlgo = %08lx/%08lx/%08lx/%08lx/%08lx Algo_strength = %08lx\n", cp->name, cp->algorithm_mkey, cp->algorithm_auth, cp->algorithm_enc, cp->algorithm_mac, cp->algorithm_ssl, cp->algo_strength);
-#endif
 
 			if (alg_mkey && !(alg_mkey & cp->algorithm_mkey))
 				continue;
@@ -962,9 +955,6 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey,
 				continue;
 		}
 
-#ifdef CIPHER_DEBUG
-		printf("Action = %d\n", rule);
-#endif
 
 		/* add the cipher if it has not been added yet. */
 		if (rule == CIPHER_ADD) {
@@ -1439,9 +1429,6 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
 	for (curr = head; curr != NULL; curr = curr->next) {
 		if (curr->active) {
 			sk_SSL_CIPHER_push(cipherstack, curr->cipher);
-#ifdef CIPHER_DEBUG
-			printf("<%s>\n", curr->cipher->name);
-#endif
 		}
 	}
 	free(co_list);	/* Not needed any longer */
-- 
cgit v1.2.3-55-g6feb