diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-12-13 08:07:25 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-06 11:15:14 +0100 |
| commit | a902e43d7d34dd3d2cb0a3fe0fe7ae23d9021b40 (patch) | |
| tree | 214adc965fd536e667938f7a265b952364ef7a8c /crypto/pkcs12 | |
| parent | 3a9b3d2d93017014032d1bbed3e4193bb423eaae (diff) | |
Adapt OPENSSL_DEBUG_KEYGEN to the new generic trace API
Co-authored-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 9e9fb172dd..3580754a58 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -11,16 +11,7 @@ #include "internal/cryptlib.h" #include <openssl/pkcs12.h> #include <openssl/bn.h> - -/* Uncomment out this line to get debugging info about key generation */ -/* - * #define OPENSSL_DEBUG_KEYGEN - */ -#ifdef OPENSSL_DEBUG_KEYGEN -# include <openssl/bio.h> -extern BIO *bio_err; -void h__dump(unsigned char *p, int len); -#endif +#include <openssl/trace.h> /* PKCS12 compatible key/IV generation */ #ifndef min @@ -82,23 +73,22 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int i, j, u, v; int ret = 0; EVP_MD_CTX *ctx = NULL; -#ifdef OPENSSL_DEBUG_KEYGEN unsigned char *tmpout = out; int tmpn = n; -#endif ctx = EVP_MD_CTX_new(); if (ctx == NULL) goto err; -#ifdef OPENSSL_DEBUG_KEYGEN - 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 + OSSL_TRACE_BEGIN(PKCS12_KEYGEN) { + BIO_printf(trc_out, "PKCS12_key_gen_uni(): ID %d, ITER %d\n", id, iter); + BIO_printf(trc_out, "Password (length %d):\n", passlen); + BIO_hex_string(trc_out, 0, passlen, pass, passlen); + BIO_printf(trc_out, "\n"); + BIO_printf(trc_out, "Salt (length %d):\n", saltlen); + BIO_hex_string(trc_out, 0, saltlen, salt, saltlen); + BIO_printf(trc_out, "\n"); + } OSSL_TRACE_END(PKCS12_KEYGEN); v = EVP_MD_block_size(md_type); u = EVP_MD_size(md_type); if (u < 0 || v <= 0) @@ -136,10 +126,11 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, } memcpy(out, Ai, min(n, u)); if (u >= n) { -#ifdef OPENSSL_DEBUG_KEYGEN - fprintf(stderr, "Output KEY (length %d)\n", tmpn); - h__dump(tmpout, tmpn); -#endif + OSSL_TRACE_BEGIN(PKCS12_KEYGEN) { + BIO_printf(trc_out, "Output KEY (length %d)\n", tmpn); + BIO_hex_string(trc_out, 0, tmpn, tmpout, tmpn); + BIO_printf(trc_out, "\n"); + } OSSL_TRACE_END(PKCS12_KEYGEN); ret = 1; goto end; } @@ -172,12 +163,3 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, EVP_MD_CTX_free(ctx); return ret; } - -#ifdef OPENSSL_DEBUG_KEYGEN -void h__dump(unsigned char *p, int len) -{ - for (; len--; p++) - fprintf(stderr, "%02X", *p); - fprintf(stderr, "\n"); -} -#endif |