Commit 5f8a5f46 authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt OPENSSL_DEBUG_DECRYPT to the new generic trace API 



Co-authored-by: default avatarDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
parent b9ce85f6

crypto/pkcs12/p12_decr.c

+6 −17
Original line number Diff line number Diff line
@@ -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);

crypto/trace.c

+1 −0
Original line number Diff line number Diff line
@@ -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),

};

include/openssl/trace.h

+3 −2
Original line number Diff line number Diff line
@@ -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);