Clear warnings/errors within CIPHER_DEBUG code sections

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 0c403e80a9952c83a38eab3c8a4ce42e17a2cee0)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 73852fbc3be241e739708b533b96087e133e6197..c036dabed147c37e1b3c170a302bcda6137ed7d9 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3810,17 +3810,17 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 #endif
 
 #ifdef CIPHER_DEBUG
-       printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), (void *)srvr);
+       fprintf(stderr, "Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), (void *)srvr);
        for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
                {
                c=sk_SSL_CIPHER_value(srvr,i);
-               printf("%p:%s\n",(void *)c,c->name);
+               fprintf(stderr, "%p:%s\n",(void *)c,c->name);
                }
-       printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), (void *)clnt);
+       fprintf(stderr, "Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), (void *)clnt);
        for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
            {
            c=sk_SSL_CIPHER_value(clnt,i);
-           printf("%p:%s\n",(void *)c,c->name);
+           fprintf(stderr, "%p:%s\n",(void *)c,c->name);
            }
 #endif
 
@@ -3883,7 +3883,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                        {
                        ok = (alg_k & emask_k) && (alg_a & emask_a);
 #ifdef CIPHER_DEBUG
-                       printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n",ok,alg_k,alg_a,emask_k,emask_a,
+                       fprintf(stderr, "%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n",ok,alg_k,alg_a,emask_k,emask_a,
                               (void *)c,c->name);
 #endif
                        }
@@ -3891,7 +3891,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                        {
                        ok = (alg_k & mask_k) && (alg_a & mask_a);
 #ifdef CIPHER_DEBUG
-                       printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",ok,alg_k,alg_a,mask_k,mask_a,(void *)c,
+                       fprintf(stderr, "%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",ok,alg_k,alg_a,mask_k,mask_a,(void *)c,
                               c->name);
 #endif
                        }

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b5b3ecba29384103469234428a02d906c041ab86..29a80516fe8c80560ba1e96701e14001b50136a0 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1156,14 +1156,15 @@ int ssl3_get_client_hello(SSL *s)
                id=s->session->cipher->id;
 
 #ifdef CIPHER_DEBUG
-               printf("client sent %d ciphers\n",sk_num(ciphers));
+               fprintf(stderr,"client sent %d ciphers\n",sk_SSL_CIPHER_num(ciphers));
 #endif
                for (i=0; i<sk_SSL_CIPHER_num(ciphers); i++)
                        {
                        c=sk_SSL_CIPHER_value(ciphers,i);
 #ifdef CIPHER_DEBUG
-                       printf("client [%2d of %2d]:%s\n",
-                               i,sk_num(ciphers),SSL_CIPHER_get_name(c));
+                       fprintf(stderr,"client [%2d of %2d]:%s\n",
+                               i,sk_SSL_CIPHER_num(ciphers),
+                               SSL_CIPHER_get_name(c));
 #endif
                        if (c->id == id)
                                {

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 8188ff5d95c1a949efa1cf1c89e91ba3465049b0..a5c8d94af6dcf67862c28593deb019fcbd9a32ea 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -931,7 +931,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
        int reverse = 0;
 
 #ifdef CIPHER_DEBUG
-       printf("Applying rule %d with %08lx/%08lx/%08lx/%08lx/%08lx %08lx (%d)\n",
+       fprintf(stderr, "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
 
@@ -977,7 +977,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                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);
+                       fprintf(stderr, "\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))
@@ -997,7 +997,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                        }
 
 #ifdef CIPHER_DEBUG
-               printf("Action = %d\n", rule);
+               fprintf(stderr, "Action = %d\n", rule);
 #endif
 
                /* add the cipher if it has not been added yet. */
@@ -1513,7 +1513,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
                        {
                        sk_SSL_CIPHER_push(cipherstack, curr->cipher);
 #ifdef CIPHER_DEBUG
-                       printf("<%s>\n",curr->cipher->name);
+                       fprintf(stderr, "<%s>\n",curr->cipher->name);
 #endif
                        }
                }