fix warnings for CIPHER_DEBUG builds

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index d438cbb10d0114a7cb05c78d6382da7abe4146bc..e4ee7fcd3e40f3bca9be76245ece701d1a095850 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2489,30 +2489,30 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 #endif
 
 #ifdef CIPHER_DEBUG
 #endif
 
 #ifdef CIPHER_DEBUG

-        printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), srvr);
-        for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
-           {
-           c=sk_SSL_CIPHER_value(srvr,i);
-           printf("%p:%s\n",c,c->name);
-           }
-        printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), clnt);
-        for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
+       printf("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);
+               }
+       printf("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);
            {
            c=sk_SSL_CIPHER_value(clnt,i);

-           printf("%p:%s\n",c,c->name);
+           printf("%p:%s\n",(void *)c,c->name);

            }
 #endif
 
        if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)
            }
 #endif
 
        if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)

-           {
-           prio = srvr;
-           allow = clnt;
-           }
+               {
+               prio = srvr;
+               allow = clnt;
+               }

        else
        else

-           {
-           prio = clnt;
-           allow = srvr;
-           }
+               {
+               prio = clnt;
+               allow = srvr;
+               }

 
        for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
                {
 
        for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
                {


@@ -2532,11 +2532,11 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                alg_a=c->algorithm_auth;
 
 #ifndef OPENSSL_NO_KRB5
                alg_a=c->algorithm_auth;
 
 #ifndef OPENSSL_NO_KRB5

-                if (alg_k & SSL_kKRB5)
-                        {
-                        if ( !kssl_keytab_is_available(s->kssl_ctx) )
-                            continue;
-                        }
+               if (alg_k & SSL_kKRB5)
+                       {
+                       if ( !kssl_keytab_is_available(s->kssl_ctx) )
+                           continue;
+                       }

 #endif /* OPENSSL_NO_KRB5 */
 #ifndef OPENSSL_NO_PSK
                /* with PSK there must be server callback set */
 #endif /* OPENSSL_NO_KRB5 */
 #ifndef OPENSSL_NO_PSK
                /* with PSK there must be server callback set */


@@ -2549,14 +2549,14 @@ 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,
                        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,

-                              c,c->name);
+                              (void *)c,c->name);

 #endif
                        }
                else
                        {
                        ok = (alg_k & mask_k) && (alg_a & mask_a);
 #ifdef CIPHER_DEBUG
 #endif
                        }
                else
                        {
                        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,c,
+                       printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",ok,alg_k,alg_a,mask_k,mask_a,(void *)c,

                               c->name);
 #endif
                        }
                               c->name);
 #endif
                        }

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 1c28daa2b8c5beaab69de428c407abaa43c7b5af..6e5d1b7f46632197bc11c4362bcf892991fac62b 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1712,7 +1712,7 @@ void ssl_set_cert_masks(CERT *c, 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",
 
 #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,ecdh_tmp,
+               rsa_tmp,rsa_tmp_export,dh_tmp,have_ecdh_tmp,

                rsa_enc,rsa_enc_export,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
 #endif
 
                rsa_enc,rsa_enc_export,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
 #endif