diff options
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 21 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 1 |
2 files changed, 10 insertions, 12 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 19285c6cee..02fdd20e2f 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -104,13 +104,12 @@ int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, #ifdef DEBUG_KEYGEN unsigned char *tmpout = out; int tmpn = n; - BIO_printf (bio_err, "KEYGEN DEBUG\n"); - BIO_printf (bio_err, "ID %d, ITER %d\n", id, iter); - BIO_printf (bio_err, "Password (length %d):\n", passlen); - h__dump (pass, passlen); - BIO_printf (bio_err, "Salt (length %d):\n", saltlen); - h__dump (salt, saltlen); - BIO_printf (bio_err, "ID %d, ITER %d\n\n", id, iter); + fprintf(stderr, "KEYGEN DEBUG\n"); + fprintf(stderr, "ID %d, ITER %d\n", id, iter); + fprintf(stderr, "Password (length %d):\n", passlen); + h__dump(pass, passlen); + fprintf(stderr, "Salt (length %d):\n", saltlen); + h__dump(salt, saltlen); #endif v = EVP_MD_block_size (md_type); u = EVP_MD_size (md_type); @@ -150,8 +149,8 @@ int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, BN_free (Ij); BN_free (Bpl1); #ifdef DEBUG_KEYGEN - BIO_printf (bio_err, "Output KEY (length %d)\n", tmpn); - h__dump (tmpout, tmpn); + fprintf(stderr, "Output KEY (length %d)\n", tmpn); + h__dump(tmpout, tmpn); #endif return 1; } @@ -176,7 +175,7 @@ int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, #ifdef DEBUG_KEYGEN void h__dump (unsigned char *p, int len) { - for (; len --; p++) BIO_printf (bio_err, "%02X", *p); - BIO_printf (bio_err, "\n"); + for (; len --; p++) fprintf(stderr, "%02X", *p); + fprintf(stderr, "\n"); } #endif diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index 7cb553632c..058efcca2b 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -329,7 +329,6 @@ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher, BIO *p7bio = NULL; int i; X509 *x509; - char inbuf[4096]; static char txthdr[] = "Content-type: text/plain\r\n\r\n"; if(!(p7 = PKCS7_new())) { PKCS7err(PKCS7_F_PKCS7_ENCRYPT,ERR_R_MALLOC_FAILURE); |