bjayesh/m241Neelima
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Enabled Trace by default, added trace routines to libapps and added setup_trace to all configurable apps.' (#74) from enable_trace_support into master

Browse Source 
Reviewed-on: http://13.234.246.121:3000/Neominds/ossl35vx69/pulls/74
This commit is contained in:
bjayesh
2026-07-30 20:46:02 +05:30
committed by neelimap
parent cc16d0b785
commit 1f8cf8b317
43 changed files with 426 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/asn1parse.c
+6
View File
@@ -17,6 +17,8 @@
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/asn1t.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -77,6 +79,10 @@ int asn1parse_main(int argc, char **argv)
OPTION_CHOICE o;
const ASN1_ITEM *it = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, asn1parse_options);
if ((osk = sk_OPENSSL_STRING_new_null()) == NULL) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/ca.c
+6
View File
@@ -24,6 +24,8 @@
#include <openssl/objects.h>
#include <openssl/ocsp.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
#ifndef W_OK
# ifdef OPENSSL_SYS_VMS
@@ -308,6 +310,10 @@ int ca_main(int argc, char **argv)
X509_REVOKED *r = NULL;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, ca_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/crl.c
+6
View File
@@ -17,6 +17,8 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -98,6 +100,10 @@ int crl_main(int argc, char **argv)
int hash_old = 0;
#endif
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("digest");
prog = opt_init(argc, argv, crl_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/crl2pkcs7.c
+6
View File
@@ -18,6 +18,8 @@
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#include <openssl/objects.h>
#include <openssl/trace.h>
#include "app_trace.h"
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
@@ -60,6 +62,10 @@ int crl2pkcs7_main(int argc, char **argv)
0;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, crl2pkcs7_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/dgst.c
+6
View File
@@ -20,6 +20,8 @@
#include <openssl/pem.h>
#include <openssl/hmac.h>
#include <ctype.h>
#include <openssl/trace.h>
#include "app_trace.h"
#undef OSSL_DGST_BUFSIZE
#define OSSL_DGST_BUFSIZE 1024*8
@@ -117,6 +119,10 @@ int dgst_main(int argc, char **argv)
EVP_MD_CTX *signctx = NULL;
int oneshot_sign = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
reset_unknown();
buf = app_malloc(OSSL_DGST_BUFSIZE, "I/O buffer");
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/dhparam.c
+6
View File
@@ -27,6 +27,8 @@
#include <openssl/param_build.h>
#include <openssl/encoder.h>
#include <openssl/decoder.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define DEFBITS 2048
@@ -91,6 +93,10 @@ int dhparam_main(int argc, char **argv)
int informat = FORMAT_PEM, outformat = FORMAT_PEM, check = 0, noout = 0;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, dhparam_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/dsa.c
+6
View File
@@ -25,6 +25,8 @@
#include <openssl/encoder.h>
#include <openssl/core_names.h>
#include <openssl/core_dispatch.h>
#include <openssl/trace.h>
#include "app_trace.h"
#ifndef OPENSSL_NO_RC4
# define DEFAULT_PVK_ENCR_STRENGTH 2
@@ -92,6 +94,10 @@ int dsa_main(int argc, char **argv)
int selection = 0;
OSSL_ENCODER_CTX *ectx = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, dsa_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/dsaparam.c
+6
View File
@@ -21,6 +21,8 @@
#include <openssl/dsa.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
static int verbose = 0;
@@ -74,6 +76,10 @@ int dsaparam_main(int argc, char **argv)
char *infile = NULL, *outfile = NULL, *prog;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, dsaparam_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/ec.c
+6
View File
@@ -16,6 +16,8 @@
#include <openssl/core_dispatch.h>
#include <openssl/params.h>
#include <openssl/err.h>
#include <openssl/trace.h>
#include "app_trace.h"
#include "apps.h"
#include "progs.h"
@@ -80,6 +82,10 @@ int ec_main(int argc, char **argv)
char *point_format = NULL;
int no_public = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, ec_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/ecparam.c
+6
View File
@@ -20,6 +20,8 @@
#include "apps.h"
#include "progs.h"
#include "ec_common.h"
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -107,6 +109,10 @@ int ecparam_main(int argc, char **argv)
int no_seed = 0, check = 0, check_named = 0, text = 0, genkey = 0;
int list_curves = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, ecparam_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/enc.c
+6
View File
@@ -20,6 +20,8 @@
#include <openssl/x509.h>
#include <openssl/rand.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
@@ -159,6 +161,10 @@ int enc_main(int argc, char **argv)
EVP_SKEY *skey = NULL;
EVP_SKEYMGMT *mgmt = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
reset_unknown();
/* first check the command name */
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/engine.c
+6
View File
@@ -21,6 +21,8 @@
#include <openssl/engine.h>
#include <openssl/ssl.h>
#include <openssl/store.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -308,6 +310,10 @@ int engine_main(int argc, char **argv)
char *prog;
char *argv1;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
out = dup_bio_out(FORMAT_TEXT);
if (engines == NULL || pre_cmds == NULL || post_cmds == NULL)
goto end;
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/gendsa.c
+6
View File
@@ -21,6 +21,8 @@
#include <openssl/dsa.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -63,6 +65,10 @@ int gendsa_main(int argc, char **argv)
OPTION_CHOICE o;
int ret = 1, private = 0, verbose = 0, nbits;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, gendsa_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/genpkey.c
+6
View File
@@ -14,6 +14,8 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/trace.h>
#include "app_trace.h"
static int verbose = 1;
@@ -120,6 +122,10 @@ int genpkey_main(int argc, char **argv)
OSSL_LIB_CTX *libctx = app_get0_libctx();
STACK_OF(OPENSSL_STRING) *keyopt = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, genpkey_options);
keyopt = sk_OPENSSL_STRING_new_null();
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/genrsa.c
+5
View File
@@ -23,6 +23,8 @@
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define DEFBITS 2048
#define DEFPRIMES 2
@@ -89,6 +91,9 @@ int genrsa_main(int argc, char **argv)
OPTION_CHOICE o;
int traditional = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
if (bn == NULL || cb == NULL)
goto end;
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/include/app_trace.h
+40
View File
@@ -0,0 +1,40 @@
/*
* Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef OPENSSL_APPS_TRACE_H
# define OPENSSL_APPS_TRACE_H
# pragma once
# include <stdarg.h>
# include <openssl/bio.h>
# include <openssl/trace.h>
# ifdef __cplusplus
extern "C" {
# endif
#ifndef OPENSSL_NO_TRACE
typedef struct tracedata_st {
BIO *bio;
unsigned int ingroup:1;
} tracedata;
void setup_trace(const char *str);
#endif /* OPENSSL_NO_TRACE */
# ifdef __cplusplus
}
# endif
#endif
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/lib/app_trace.c
+146
View File
@@ -0,0 +1,146 @@
/*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#include "app_trace.h"
#include "apps.h"
#include <openssl/trace.h>
#ifndef OPENSSL_NO_TRACE
BIO *trace_bio_err = NULL;
static size_t internal_trace_cb(const char *buf, size_t cnt,
int category, int cmd, void *vdata)
{
int ret = 0;
tracedata *trace_data = vdata;
char buffer[256], *hex;
CRYPTO_THREAD_ID tid;
switch (cmd) {
case OSSL_TRACE_CTRL_BEGIN:
if (trace_data->ingroup) {
BIO_printf(trace_bio_err, "ERROR: tracing already started\n");
return 0;
}
trace_data->ingroup = 1;
tid = CRYPTO_THREAD_get_current_id();
hex = OPENSSL_buf2hexstr((const unsigned char *)&tid, sizeof(tid));
BIO_snprintf(buffer, sizeof(buffer), "TRACE[%s]:%s: ",
hex == NULL ? "<null>" : hex,
OSSL_trace_get_category_name(category));
OPENSSL_free(hex);
BIO_set_prefix(trace_data->bio, buffer);
break;
case OSSL_TRACE_CTRL_WRITE:
if (!trace_data->ingroup) {
BIO_printf(trace_bio_err, "ERROR: writing when tracing not started\n");
return 0;
}
ret = BIO_write(trace_data->bio, buf, cnt);
break;
case OSSL_TRACE_CTRL_END:
if (!trace_data->ingroup) {
BIO_printf(trace_bio_err, "ERROR: finishing when tracing not started\n");
return 0;
}
trace_data->ingroup = 0;
BIO_set_prefix(trace_data->bio, NULL);
break;
}
return ret < 0 ? 0 : ret;
}
DEFINE_STACK_OF(tracedata)
static STACK_OF(tracedata) *trace_data_stack;
void tracedata_free(tracedata *data)
{
BIO_free_all(data->bio);
OPENSSL_free(data);
}
static void cleanup_trace(void)
{
sk_tracedata_pop_free(trace_data_stack, tracedata_free);
}
static void setup_trace_category(int category)
{
BIO *channel;
tracedata *trace_data;
BIO *bio = NULL;
if (OSSL_trace_enabled(category))
return;
bio = BIO_new(BIO_f_prefix());
channel = BIO_push(bio, dup_bio_err(FORMAT_TEXT));
trace_data = OPENSSL_zalloc(sizeof(*trace_data));
if (trace_data == NULL
|| bio == NULL
|| (trace_data->bio = channel) == NULL
|| OSSL_trace_set_callback(category, internal_trace_cb,
trace_data) == 0
|| sk_tracedata_push(trace_data_stack, trace_data) == 0) {
fprintf(stderr,
"warning: unable to setup trace callback for category '%s'.\n",
OSSL_trace_get_category_name(category));
OSSL_trace_set_callback(category, NULL, NULL);
BIO_free_all(channel);
}
}
void setup_trace(const char *str)
{
char *val;
OSSL_trace_unset_all_callbacks();
/*
* We add this handler as early as possible to ensure it's executed
* as late as possible, i.e. after the TRACE code has done its cleanup
* (which happens last in OPENSSL_cleanup).
*/
atexit(cleanup_trace);
trace_data_stack = sk_tracedata_new_null();
val = OPENSSL_strdup(str);
if (val != NULL) {
char *valp = val;
char *item;
for (valp = val; (item = strtok(valp, ",")) != NULL; valp = NULL) {
int category = OSSL_trace_get_category_num(item);
if (category == OSSL_TRACE_CATEGORY_ALL) {
while (++category < OSSL_TRACE_CATEGORY_NUM)
setup_trace_category(category);
break;
} else if (category > 0) {
setup_trace_category(category);
} else {
fprintf(stderr,
"warning: unknown trace category: '%s'.\n", item);
}
}
}
OPENSSL_free(val);
}
#endif /* OPENSSL_NO_TRACE */
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/lib/build.info
+1 -1
View File
@@ -8,7 +8,7 @@ IF[{- $config{target} =~ /^vms-/ -}]
ENDIF
# Source for libapps
$LIBAPPSSRC=apps.c apps_ui.c log.c opt.c fmt.c s_cb.c s_socket.c app_rand.c \
$LIBAPPSSRC=apps.c app_trace.c apps_ui.c log.c opt.c fmt.c s_cb.c s_socket.c app_rand.c \
columns.c app_params.c names.c app_provider.c app_x509.c http_server.c \
engine_lib.c engine_loader.c app_libctx.c apps_opt_printf.c
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/nseq.c
+6
View File
@@ -13,6 +13,8 @@
#include "progs.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -44,6 +46,10 @@ int nseq_main(int argc, char **argv)
int toseq = 0, ret = 1, i;
char *infile = NULL, *outfile = NULL, *prog;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, nseq_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/ocsp.c
+6
View File
@@ -32,6 +32,8 @@
#include <openssl/evp.h>
#include <openssl/bn.h>
#include <openssl/x509v3.h>
#include <openssl/trace.h>
#include "app_trace.h"
#if defined(OPENSSL_SYS_VXWORKS)
/* not supported */
@@ -252,6 +254,10 @@ int ocsp_main(int argc, char **argv)
unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
if ((reqnames = sk_OPENSSL_STRING_new_null()) == NULL
|| (ids = sk_OCSP_CERTID_new_null()) == NULL
|| (vpm = X509_VERIFY_PARAM_new()) == NULL)
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/passwd.c
+6
View File
@@ -21,6 +21,8 @@
#endif
#include <openssl/md5.h>
#include <openssl/sha.h>
#include <openssl/trace.h>
#include "app_trace.h"
static const unsigned char cov_2char[64] = {
/* from crypto/des/fcrypt.c */
@@ -107,6 +109,10 @@ int passwd_main(int argc, char **argv)
size_t pw_maxlen = 256; /* arbitrary limit, should be enough for most
* passwords */
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, passwd_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkcs12.c
+6
View File
@@ -22,6 +22,8 @@
#include <openssl/provider.h>
#include <openssl/kdf.h>
#include <openssl/rand.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define NOKEYS 0x1
#define NOCERTS 0x2
@@ -191,6 +193,10 @@ int pkcs12_main(int argc, char **argv)
EVP_CIPHER *enc = (EVP_CIPHER *)default_enc;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, pkcs12_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkcs7.c
+6
View File
@@ -19,6 +19,8 @@
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -64,6 +66,10 @@ int pkcs7_main(int argc, char **argv)
OPTION_CHOICE o;
OSSL_LIB_CTX *libctx = app_get0_libctx();
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, pkcs7_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkcs8.c
+6
View File
@@ -16,6 +16,8 @@
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pkcs12.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define STR(a) XSTR(a)
#define XSTR(a) #a
@@ -95,6 +97,10 @@ int pkcs8_main(int argc, char **argv)
#endif
int saltlen = 0; /* A value of zero chooses the default */
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, pkcs8_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkey.c
+6
View File
@@ -16,6 +16,8 @@
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/core_names.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -83,6 +85,10 @@ int pkey_main(int argc, char **argv)
char *point_format = NULL;
#endif
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, pkey_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkeyparam.c
+6
View File
@@ -15,6 +15,8 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -53,6 +55,10 @@ int pkeyparam_main(int argc, char **argv)
OPTION_CHOICE o;
char *infile = NULL, *outfile = NULL, *prog;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, pkeyparam_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/pkeyutl.c
+7
View File
@@ -14,6 +14,8 @@
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <sys/stat.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define KEY_NONE 0
#define KEY_PRIVKEY 1
@@ -149,6 +151,11 @@ int pkeyutl_main(int argc, char **argv)
EVP_MD_CTX *mctx = NULL;
EVP_MD *md = NULL;
int filesize = -1;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
OSSL_LIB_CTX *libctx = app_get0_libctx();
prog = opt_init(argc, argv, pkeyutl_options);
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/rand.c
+6
View File
@@ -17,6 +17,8 @@
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -58,6 +60,10 @@ int rand_main(int argc, char **argv)
uint64_t scaled_num = 0;
uint8_t *buf = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, rand_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/req.c
+6
View File
@@ -27,6 +27,8 @@
#include <openssl/bn.h>
#include <openssl/lhash.h>
#include <openssl/rsa.h>
#include <openssl/trace.h>
#include "app_trace.h"
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
@@ -275,6 +277,10 @@ int req_main(int argc, char **argv)
long newkey_len = -1;
unsigned long chtype = MBSTRING_ASC, reqflag = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
opt_set_unknown_name("digest");
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/rsa.c
+6
View File
@@ -26,6 +26,8 @@
#include <openssl/pem.h>
#include <openssl/bn.h>
#include <openssl/encoder.h>
#include <openssl/trace.h>
#include "app_trace.h"
/*
* This include is to get OSSL_KEYMGMT_SELECT_*, which feels a bit
@@ -139,6 +141,10 @@ int rsa_main(int argc, char **argv)
int selection = 0;
OSSL_ENCODER_CTX *ectx = NULL;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("cipher");
prog = opt_init(argc, argv, rsa_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/rsautl.c
+6
View File
@@ -15,6 +15,8 @@
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/trace.h>
#include "app_trace.h"
#define RSA_SIGN 1
#define RSA_VERIFY 2
@@ -85,6 +87,10 @@ int rsautl_main(int argc, char **argv)
int hexdump = 0, asn1parse = 0, need_priv = 0, rev = 0;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, rsautl_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/s_client.c
+6
View File
@@ -48,6 +48,8 @@ typedef unsigned int u_int;
#include "s_apps.h"
#include "timeouts.h"
#include "internal/sockets.h"
#include <openssl/trace.h>
#include "app_trace.h"
#if defined(__has_feature)
# if __has_feature(memory_sanitizer)
@@ -961,6 +963,10 @@ int s_client_main(int argc, char **argv)
BIO_ADDR *peer_addr = NULL;
struct user_data_st user_data;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
FD_ZERO(&readfds);
FD_ZERO(&writefds);
/* Known false-positive of MemorySanitizer. */
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/s_server.c
+6
View File
@@ -57,6 +57,8 @@ typedef unsigned int u_int;
#include <openssl/ebcdic.h>
#endif
#include "internal/sockets.h"
#include <openssl/trace.h>
#include "app_trace.h"
static int not_resumable_sess_cb(SSL *s, int is_forward_secure);
static int sv_body(int s, int stype, int prot, unsigned char *context);
@@ -1114,6 +1116,10 @@ int s_server_main(int argc, char *argv[])
use_sendfile = 0;
use_zc_sendfile = 0;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
#if defined(OPENSSL_SYS_VXWORKS_SUPPORT)
if (bio_err == NULL)
bio_err = dup_bio_err(FORMAT_TEXT);
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/smime.c
+7
View File
@@ -18,6 +18,8 @@
#include <openssl/err.h>
#include <openssl/x509_vfy.h>
#include <openssl/x509v3.h>
#include <openssl/trace.h>
#include "app_trace.h"
static int save_certs(char *signerfile, STACK_OF(X509) *signers);
static int smime_cb(int ok, X509_STORE_CTX *ctx);
@@ -184,6 +186,11 @@ int smime_main(int argc, char **argv)
int vpmtouched = 0, rv = 0;
ENGINE *e = NULL;
const char *mime_eol = "\n";
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
OSSL_LIB_CTX *libctx = app_get0_libctx();
if ((vpm = X509_VERIFY_PARAM_new()) == NULL)
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/speed.c
+7
View File
@@ -44,6 +44,8 @@
#include <openssl/core_names.h>
#include <openssl/async.h>
#include <openssl/provider.h>
#include <openssl/trace.h>
#include "app_trace.h"
#if !defined(OPENSSL_SYS_MSDOS)
# include <unistd.h>
#endif
@@ -1907,6 +1909,11 @@ int speed_main(int argc, char **argv)
#ifndef NO_FORK
int multi = 0;
#endif
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
long op_count = 1;
openssl_speed_sec_t seconds = { SECONDS, RSA_SECONDS, DSA_SECONDS,
ECDSA_SECONDS, ECDH_SECONDS,
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/spkac.c
+6
View File
@@ -19,6 +19,8 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -73,6 +75,10 @@ int spkac_main(int argc, char **argv)
int keyformat = FORMAT_UNDEF;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, spkac_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/storeutl.c
+6
View File
@@ -15,6 +15,8 @@
#include <openssl/pem.h>
#include <openssl/store.h>
#include <openssl/x509v3.h> /* s2i_ASN1_INTEGER */
#include <openssl/trace.h>
#include "app_trace.h"
static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
int expected, int criterion, OSSL_STORE_SEARCH *search,
@@ -88,6 +90,10 @@ int storeutl_main(int argc, char *argv[])
EVP_MD *digest = NULL;
OSSL_LIB_CTX *libctx = app_get0_libctx();
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
opt_set_unknown_name("digest");
prog = opt_init(argc, argv, storeutl_options);
while ((o = opt_next()) != OPT_EOF) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/verify.c
+6
View File
@@ -17,6 +17,8 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/pem.h>
#include <openssl/trace.h>
#include "app_trace.h"
static int cb(int ok, X509_STORE_CTX *ctx);
static int check(X509_STORE *ctx, const char *file,
@@ -89,6 +91,10 @@ int verify_main(int argc, char **argv)
int vpmtouched = 0, crl_download = 0, show_chain = 0, i = 0, ret = 1;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
if ((vpm = X509_VERIFY_PARAM_new()) == NULL)
goto end;
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/version.c
+6
View File
@@ -15,6 +15,8 @@
#include <openssl/evp.h>
#include <openssl/crypto.h>
#include <openssl/bn.h>
#include <openssl/trace.h>
#include "app_trace.h"
typedef enum OPTION_choice {
OPT_COMMON,
@@ -57,6 +59,10 @@ int version_main(int argc, char **argv)
char *prog;
OPTION_CHOICE o;
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
prog = opt_init(argc, argv, version_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/apps/x509.c
+6
View File
@@ -22,6 +22,8 @@
#include <openssl/objects.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/trace.h>
#include "app_trace.h"
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
@@ -306,6 +308,10 @@ int x509_main(int argc, char **argv)
int subject_hash_old = 0, issuer_hash_old = 0;
#endif
#ifndef OPENSSL_NO_TRACE
setup_trace(getenv("OPENSSL_TRACE"));
#endif
reset_unknown();
ctx = X509_STORE_new();
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/crypto/trace.c
+8
View File
@@ -395,6 +395,14 @@ static int trace_attach_w_callback_cb(int category, int type, const void *data)
}
#endif
void OSSL_trace_unset_all_callbacks(void)
{
int i;
for (i = 0; i < OSSL_TRACE_CATEGORY_NUM; i++) {
OSSL_trace_set_callback(i, NULL, NULL);
}
}
int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
{
#ifndef OPENSSL_NO_TRACE
vxworks-6.9/target/src/openssl/OPENSSL/openssl-3.5.0/include/openssl/trace.h
+4
View File
@@ -64,6 +64,10 @@ extern "C" {
# define OSSL_TRACE_CATEGORY_NUM 24
/* KEEP THIS LIST IN SYNC with trace_categories[] in crypto/trace.c */
/* Unsets (clears) all previously registered trace callbacks for every trace category */
void OSSL_trace_unset_all_callbacks(void);
/* Returns the trace category number for the given |name| */
int OSSL_trace_get_category_num(const char *name);
vxworks-6.9/target/src/openssl/openssl_src/vxworks.krnl.mak
+1 -1
View File
@@ -32,7 +32,7 @@ endif
OPENSSL_CPPFLAGS = -DOPENSSL_SYS_VXWORKS_SUPPORT -DOPENSSL_NO_THREAD_POOL -DVX69_TIMESTAMP_ENTROPY_SUPPORT
OPENSSL_CONFIGURE_OPTIONS = no-shared
OPENSSL_CONFIGURE_OPTIONS = no-shared enable-trace
ifneq (, $(findstring enable-fips, $(CONFIGURE_CMD)))
OPENSSL_FIPS_ENABLE =