Commit 2afe3167 authored by Bodo Möller's avatar Bodo Möller
Browse files

fix warnings for CIPHER_DEBUG builds

parent 7e69565f

ssl/s3_lib.c

+24 −24
Original line number Diff line number Diff line
@@ -2489,17 +2489,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), srvr);

	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",c,c->name);

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

		}

        printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), clnt);

	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);

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

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

	    }

#endif
@@ -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,

			       c,c->name);

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

#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

			}

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

	        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