generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix warnings for CIPHER_DEBUG builds

Browse Source
This commit is contained in:
Bodo Möller
2007-02-19 16:59:13 +00:00
parent 7e69565fe6
commit 2afe316721
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/s3_lib.c
View File

@@ -2489,17 +2489,17 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
#endif #endif
#ifdef CIPHER_DEBUG #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) for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
{ {
c=sk_SSL_CIPHER_value(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) 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 #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); ok = (alg_k & emask_k) && (alg_a & emask_a);
#ifdef CIPHER_DEBUG #ifdef CIPHER_DEBUG
printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n",ok,alg_k,alg_a,emask_k,emask_a, 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 #endif
} }
else else
{ {
ok = (alg_k & mask_k) && (alg_a & mask_a); ok = (alg_k & mask_k) && (alg_a & mask_a);
#ifdef CIPHER_DEBUG #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); c->name);
#endif #endif
} }

2
ssl/ssl_lib.c
View File

@@ -1712,7 +1712,7 @@ void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher)
#ifdef CIPHER_DEBUG #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", 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); rsa_enc,rsa_enc_export,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
#endif #endif