aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-12-15 02:36:48 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-12-15 02:36:48 +0000
commit1887988497aa4da8ef2a7948e872e7baac3a07fa (patch)
tree8e32cb5156ad12d24a257d0db14efb0ffc2e904c /crypto/pkcs12
parent3fc9635ea763d9f2abeacf5a8d111964fbd4cb2d (diff)
downloadopenssl-1887988497aa4da8ef2a7948e872e7baac3a07fa.tar.gz
Delete an unused variable and make the PKCS#12 keygen debugging code work
again.
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r--crypto/pkcs12/p12_key.c21
1 files changed, 10 insertions, 11 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