wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt OPENSSL_DEBUG_DECRYPT to the new generic trace API

Browse source 
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)
This commit is contained in:
Richard Levitte 2018-12-13 12:04:26 +01:00
parent b9ce85f631
commit 5f8a5f46e4
3 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crypto/pkcs12/p12_decr.c
View file

@ -10,11 +10,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/pkcs12.h>
/* Define this to dump decrypted output to files called DERnnn */
/*
* #define OPENSSL_DEBUG_DECRYPT
*/
#include <openssl/trace.h>
/*
* Encrypt/Decrypt a buffer based on password and algor, result in a
@ -95,18 +91,11 @@ void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
return NULL;
}
p = out;
#ifdef OPENSSL_DEBUG_DECRYPT
{
FILE *op;
char fname[30];
static int fnm = 1;
sprintf(fname, "DER%d", fnm++);
op = fopen(fname, "wb");
fwrite(p, 1, outlen, op);
fclose(op);
}
#endif
OSSL_TRACE_BEGIN(PKCS12_DECRYPT) {
BIO_printf(trc_out, "\n");
BIO_dump(trc_out, out, outlen);
BIO_printf(trc_out, "\n");
} OSSL_TRACE_END(PKCS12_DECRYPT);
ret = ASN1_item_d2i(NULL, &p, outlen, it);
if (zbuf)
OPENSSL_cleanse(out, outlen);

1
crypto/trace.c
View file

@ -128,6 +128,7 @@ static const struct trace_category_st trace_categories[] = {
TRACE_CATEGORY_(ENGINE_REF_COUNT),
TRACE_CATEGORY_(PKCS5V2),
TRACE_CATEGORY_(PKCS12_KEYGEN),
TRACE_CATEGORY_(PKCS12_DECRYPT),
TRACE_CATEGORY_(X509V3_POLICY),
};

5
include/openssl/trace.h
View file

@ -41,8 +41,9 @@ extern "C" {
# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 6
# define OSSL_TRACE_CATEGORY_PKCS5V2 7
# define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN 8
# define OSSL_TRACE_CATEGORY_X509V3_POLICY 9
# define OSSL_TRACE_CATEGORY_NUM 10
# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 9
# define OSSL_TRACE_CATEGORY_X509V3_POLICY 10
# define OSSL_TRACE_CATEGORY_NUM 11
/* Returns the trace category number for the given |name| */
int OSSL_trace_get_category_num(const char *name);