2 files changed, 0 insertions, 25 deletions

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 */
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 694bc900a0..deef714be1 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1442,9 +1442,6 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p,
                 j = put_cb ? put_cb(&scsv, p) :
                     ssl_put_cipher_by_char(s, &scsv, p);
                 p += j;
-#ifdef OPENSSL_RI_DEBUG
-                fprintf(stderr, "SCSV sent by client\n");
-#endif
         }
 
         return (p - q);
@@ -1490,9 +1487,6 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num,
                         }
                         s->s3->send_connection_binding = 1;
                         p += n;
-#ifdef OPENSSL_RI_DEBUG
-                        fprintf(stderr, "SCSV received by server\n");
-#endif
                         continue;
                 }
 
@@ -2066,12 +2060,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
 
 
 
-#ifdef CIPHER_DEBUG
-        printf("rt=%d rte=%d dht=%d ecdht=%d re=%d ree=%d "
-            "rs=%d ds=%d dhr=%d dhd=%d\n",
-            rsa_tmp, rsa_tmp_export, dh_tmp, have_ecdh_tmp,
-            rsa_enc, rsa_enc_export, rsa_sign, dsa_sign, dh_rsa, dh_dsa);
-#endif
 
         cpk = &(c->pkeys[SSL_PKEY_GOST01]);
         if (cpk->x509 != NULL && cpk->privatekey !=NULL) {