QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 19:24:37 +00:00
Code Issues Projects Releases Wiki Activity

DECODER: Add tracing

Browse Source 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13248)
This commit is contained in:
Richard Levitte 2020-10-28 10:13:24 +01:00
parent df65c06b59
commit de5008a407
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crypto/encode_decode/decoder_lib.c
View File

@ -14,6 +14,7 @@
#include <openssl/evperr.h> #include <openssl/evperr.h>
#include <openssl/ecerr.h> #include <openssl/ecerr.h>
#include <openssl/x509err.h> #include <openssl/x509err.h>
#include <openssl/trace.h>
#include "internal/passphrase.h" #include "internal/passphrase.h"
#include "crypto/decoder.h" #include "crypto/decoder.h"
#include "encoder_local.h" #include "encoder_local.h"
@ -210,6 +211,8 @@ void ossl_decoder_instance_free(OSSL_DECODER_INSTANCE *decoder_inst)
int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx, int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx,
OSSL_DECODER_INSTANCE *di) OSSL_DECODER_INSTANCE *di)
{ {
int ok;
if (ctx->decoder_insts == NULL if (ctx->decoder_insts == NULL
&& (ctx->decoder_insts = && (ctx->decoder_insts =
sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) { sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) {
@ -217,7 +220,18 @@ int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx,
return 0; return 0;
} }
return (sk_OSSL_DECODER_INSTANCE_push(ctx->decoder_insts, di) > 0); ok = (sk_OSSL_DECODER_INSTANCE_push(ctx->decoder_insts, di) > 0);
if (ok) {
OSSL_TRACE_BEGIN(DECODER) {
BIO_printf(trc_out,
"(ctx %p) Added decoder instance %p (decoder %p) with:\n",
(void *)ctx, (void *)di, (void *)di->decoder);
BIO_printf(trc_out,
" input type: %s, input structure: %s\n",
di->input_type, di->input_structure);
} OSSL_TRACE_END(DECODER);
}
return ok;
} }
int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder) int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
@ -615,6 +629,13 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
decoder_process, &new_data, decoder_process, &new_data,
ossl_pw_passphrase_callback_dec, ossl_pw_passphrase_callback_dec,
&new_data.ctx->pwdata); &new_data.ctx->pwdata);
OSSL_TRACE_BEGIN(DECODER) {
BIO_printf(trc_out,
"(ctx %p) Running decoder instance %p => %d\n",
(void *)new_data.ctx, (void *)new_decoder_inst, ok);
} OSSL_TRACE_END(DECODER);
if (ok) if (ok)
break; break;
err = ERR_peek_last_error(); err = ERR_peek_last_error();

17
crypto/encode_decode/decoder_pkey.c
View File

@ -14,6 +14,7 @@
#include <openssl/ui.h> #include <openssl/ui.h>
#include <openssl/decoder.h> #include <openssl/decoder.h>
#include <openssl/safestack.h> #include <openssl/safestack.h>
#include <openssl/trace.h>
#include "crypto/evp.h" #include "crypto/evp.h"
#include "crypto/decoder.h" #include "crypto/decoder.h"
#include "encoder_local.h" #include "encoder_local.h"
@ -388,13 +389,27 @@ OSSL_DECODER_CTX_new_by_EVP_PKEY(EVP_PKEY **pkey,
ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_MALLOC_FAILURE); ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }
OSSL_TRACE_BEGIN(DECODER) {
BIO_printf(trc_out,
"(ctx %p) Looking for %s decoders with selection %d\n",
(void *)ctx, keytype, selection);
BIO_printf(trc_out, " input type: %s, input structure: %s\n",
input_type, input_structure);
} OSSL_TRACE_END(DECODER);
if (OSSL_DECODER_CTX_set_input_type(ctx, input_type) if (OSSL_DECODER_CTX_set_input_type(ctx, input_type)
&& OSSL_DECODER_CTX_set_input_structure(ctx, input_structure) && OSSL_DECODER_CTX_set_input_structure(ctx, input_structure)
&& OSSL_DECODER_CTX_set_selection(ctx, selection) && OSSL_DECODER_CTX_set_selection(ctx, selection)
&& ossl_decoder_ctx_setup_for_EVP_PKEY(ctx, pkey, keytype, && ossl_decoder_ctx_setup_for_EVP_PKEY(ctx, pkey, keytype,
libctx, propquery) libctx, propquery)
&& OSSL_DECODER_CTX_add_extra(ctx, libctx, propquery)) && OSSL_DECODER_CTX_add_extra(ctx, libctx, propquery)) {
OSSL_TRACE_BEGIN(DECODER) {
BIO_printf(trc_out, "(ctx %p) Got %d decoders\n",
(void *)ctx, OSSL_DECODER_CTX_get_num_decoders(ctx));
} OSSL_TRACE_END(DECODER);
return ctx; return ctx;
}
OSSL_DECODER_CTX_free(ctx); OSSL_DECODER_CTX_free(ctx);
return NULL; return NULL;

1
crypto/trace.c
View File

@ -136,6 +136,7 @@ static const struct trace_category_st trace_categories[] = {
TRACE_CATEGORY_(X509V3_POLICY), TRACE_CATEGORY_(X509V3_POLICY),
TRACE_CATEGORY_(BN_CTX), TRACE_CATEGORY_(BN_CTX),
TRACE_CATEGORY_(STORE), TRACE_CATEGORY_(STORE),
TRACE_CATEGORY_(DECODER),
}; };
const char *OSSL_trace_get_category_name(int num) const char *OSSL_trace_get_category_name(int num)

3
include/openssl/trace.h
View File

@ -53,7 +53,8 @@ extern "C" {
# define OSSL_TRACE_CATEGORY_BN_CTX 12 # define OSSL_TRACE_CATEGORY_BN_CTX 12
# define OSSL_TRACE_CATEGORY_CMP 13 # define OSSL_TRACE_CATEGORY_CMP 13
# define OSSL_TRACE_CATEGORY_STORE 14 # define OSSL_TRACE_CATEGORY_STORE 14
# define OSSL_TRACE_CATEGORY_NUM 15 # define OSSL_TRACE_CATEGORY_DECODER 15
# define OSSL_TRACE_CATEGORY_NUM 16
/* Returns the trace category number for the given |name| */ /* Returns the trace category number for the given |name| */
int OSSL_trace_get_category_num(const char *name); int OSSL_trace_get_category_num(const char *name);