Clear warnings/errors within KSSL_DEBUG code sections

[oweals/openssl.git] / ssl / t1_enc.c

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 59b3fdb6da14052ea28661f460db701820e9cd91..7ef1558dee7d2b342dfadd2cb2a0c49afe8c3016 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -302,15 +302,15 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km,
                 s->session->master_key,s->session->master_key_length,
                 km,tmp,num);
 #ifdef KSSL_DEBUG
-       printf("tls1_generate_key_block() ==> %d byte master_key =\n\t",
+       fprintf(stderr,"tls1_generate_key_block() ==> %d byte master_key =\n\t",
                 s->session->master_key_length);
        {
         int i;
         for (i=0; i < s->session->master_key_length; i++)
                 {
-                printf("%02X", s->session->master_key[i]);
+                fprintf(stderr,"%02X", s->session->master_key[i]);
                 }
-        printf("\n");  }
+        fprintf(stderr,"\n");  }
 #endif    /* KSSL_DEBUG */
        return ret;
        }
@@ -348,19 +348,19 @@ int tls1_change_cipher_state(SSL *s, int which)
 #endif
 
 #ifdef KSSL_DEBUG
-       printf("tls1_change_cipher_state(which= %d) w/\n", which);
-       printf("\talg= %ld/%ld, comp= %p\n",
+       fprintf(stderr,"tls1_change_cipher_state(which= %d) w/\n", which);
+       fprintf(stderr,"\talg= %ld/%ld, comp= %p\n",
               s->s3->tmp.new_cipher->algorithm_mkey,
               s->s3->tmp.new_cipher->algorithm_auth,
               comp);
-       printf("\tevp_cipher == %p ==? &d_cbc_ede_cipher3\n", c);
-       printf("\tevp_cipher: nid, blksz= %d, %d, keylen=%d, ivlen=%d\n",
+       fprintf(stderr,"\tevp_cipher == %p ==? &d_cbc_ede_cipher3\n", c);
+       fprintf(stderr,"\tevp_cipher: nid, blksz= %d, %d, keylen=%d, ivlen=%d\n",
                 c->nid,c->block_size,c->key_len,c->iv_len);
-       printf("\tkey_block: len= %d, data= ", s->s3->tmp.key_block_length);
+       fprintf(stderr,"\tkey_block: len= %d, data= ", s->s3->tmp.key_block_length);
        {
         int i;
         for (i=0; i<s->s3->tmp.key_block_length; i++)
-               printf("%02x", s->s3->tmp.key_block[i]);  printf("\n");
+               fprintf(stderr,"%02x", s->s3->tmp.key_block[i]);  fprintf(stderr,"\n");
         }
 #endif /* KSSL_DEBUG */
 
@@ -538,11 +538,11 @@ printf("which = %04X\nmac key=",which);
 #ifdef KSSL_DEBUG
        {
         int i;
-       printf("EVP_CipherInit_ex(dd,c,key=,iv=,which)\n");
-       printf("\tkey= "); for (i=0; i<c->key_len; i++) printf("%02x", key[i]);
-       printf("\n");
-       printf("\t iv= "); for (i=0; i<c->iv_len; i++) printf("%02x", iv[i]);
-       printf("\n");
+       fprintf(stderr,"EVP_CipherInit_ex(dd,c,key=,iv=,which)\n");
+       fprintf(stderr,"\tkey= "); for (i=0; i<c->key_len; i++) fprintf(stderr,"%02x", key[i]);
+       fprintf(stderr,"\n");
+       fprintf(stderr,"\t iv= "); for (i=0; i<c->iv_len; i++) fprintf(stderr,"%02x", iv[i]);
+       fprintf(stderr,"\n");
        }
 #endif /* KSSL_DEBUG */
 
@@ -613,7 +613,7 @@ int tls1_setup_key_block(SSL *s)
        int ret=0;
 
 #ifdef KSSL_DEBUG
-       printf ("tls1_setup_key_block()\n");
+       fprintf(stderr,"tls1_setup_key_block()\n");
 #endif /* KSSL_DEBUG */
 
        if (s->s3->tmp.key_block_length != 0)
@@ -762,7 +762,7 @@ int tls1_enc(SSL *s, int send)
                }
 
 #ifdef KSSL_DEBUG
-       printf("tls1_enc(%d)\n", send);
+       fprintf(stderr,"tls1_enc(%d)\n", send);
 #endif    /* KSSL_DEBUG */
 
        if ((s->session == NULL) || (ds == NULL) || (enc == NULL))
@@ -834,18 +834,18 @@ int tls1_enc(SSL *s, int send)
 #ifdef KSSL_DEBUG
                {
                unsigned long ui;
-               printf("EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
+               fprintf(stderr,"EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
                        ds,rec->data,rec->input,l);
-               printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len\n",
+               fprintf(stderr,"\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%lu %lu], %d iv_len\n",
                        ds->buf_len, ds->cipher->key_len,
                        DES_KEY_SZ, DES_SCHEDULE_SZ,
                        ds->cipher->iv_len);
-               printf("\t\tIV: ");
-               for (i=0; i<ds->cipher->iv_len; i++) printf("%02X", ds->iv[i]);
-               printf("\n");
-               printf("\trec->input=");
-               for (ui=0; ui<l; ui++) printf(" %02x", rec->input[ui]);
-               printf("\n");
+               fprintf(stderr,"\t\tIV: ");
+               for (i=0; i<ds->cipher->iv_len; i++) fprintf(stderr,"%02X", ds->iv[i]);
+               fprintf(stderr,"\n");
+               fprintf(stderr,"\trec->input=");
+               for (ui=0; ui<l; ui++) fprintf(stderr," %02x", rec->input[ui]);
+               fprintf(stderr,"\n");
                }
 #endif /* KSSL_DEBUG */
 
@@ -870,9 +870,9 @@ int tls1_enc(SSL *s, int send)
 #ifdef KSSL_DEBUG
                {
                unsigned long i;
-               printf("\trec->data=");
+               fprintf(stderr,"\trec->data=");
                for (i=0; i<l; i++)
-                       printf(" %02x", rec->data[i]);  printf("\n");
+                       fprintf(stderr," %02x", rec->data[i]);  fprintf(stderr,"\n");
                }
 #endif /* KSSL_DEBUG */
 
@@ -1094,7 +1094,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
 
 
 #ifdef KSSL_DEBUG
-       printf ("tls1_generate_master_secret(%p,%p, %p, %d)\n", s,out, p,len);
+       fprintf(stderr,"tls1_generate_master_secret(%p,%p, %p, %d)\n", s,out, p,len);
 #endif /* KSSL_DEBUG */
 
 #ifdef TLSEXT_TYPE_opaque_prf_input
@@ -1147,7 +1147,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
 #endif
 
 #ifdef KSSL_DEBUG
-       printf ("tls1_generate_master_secret() complete\n");
+       fprintf(stderr,"tls1_generate_master_secret() complete\n");
 #endif /* KSSL_DEBUG */
        return(SSL3_MASTER_SECRET_SIZE);
        }
@@ -1162,7 +1162,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
        int rv;
 
 #ifdef KSSL_DEBUG
-       printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, context, contextlen);
+       fprintf(stderr,"tls1_export_keying_material(%p,%p,%lu,%s,%lu,%p,%lu)\n", s, out, olen, label, llen, context, contextlen);
 #endif /* KSSL_DEBUG */
 
        buff = OPENSSL_malloc(olen);
@@ -1225,7 +1225,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                      out,buff,olen);
 
 #ifdef KSSL_DEBUG
-       printf ("tls1_export_keying_material() complete\n");
+       fprintf(stderr,"tls1_export_keying_material() complete\n");
 #endif /* KSSL_DEBUG */
        goto ret;
 err1: