105 lines
4.7 KiB
Diff
105 lines
4.7 KiB
Diff
diff --color -pruN openssl-3.0.7.orig/crypto/conf/conf_sap.c openssl-3.0.7/crypto/conf/conf_sap.c
|
|
--- openssl-3.0.7.orig/crypto/conf/conf_sap.c 2022-11-01 14:14:36.000000000 +0000
|
|
+++ openssl-3.0.7/crypto/conf/conf_sap.c 2024-01-15 13:25:28.353053475 +0000
|
|
@@ -43,6 +43,7 @@ void OPENSSL_config(const char *appname)
|
|
|
|
int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
|
|
{
|
|
+ printf("[SCLE] ossl_config_int\r\n");
|
|
int ret = 0;
|
|
#if defined(OPENSSL_INIT_DEBUG) || !defined(OPENSSL_SYS_UEFI)
|
|
const char *filename;
|
|
@@ -50,8 +51,10 @@ int ossl_config_int(const OPENSSL_INIT_S
|
|
unsigned long flags;
|
|
#endif
|
|
|
|
- if (openssl_configured)
|
|
+ if (openssl_configured) {
|
|
+ printf("[SCLE] ossl_config_int -> openssl_configured\r\n");
|
|
return 1;
|
|
+ }
|
|
|
|
#if defined(OPENSSL_INIT_DEBUG) || !defined(OPENSSL_SYS_UEFI)
|
|
filename = settings ? settings->filename : NULL;
|
|
@@ -64,6 +67,8 @@ int ossl_config_int(const OPENSSL_INIT_S
|
|
filename, appname, flags);
|
|
#endif
|
|
|
|
+ printf("[SCLE] OPENSSL_INIT: ossl_config_int(%s, %s, %lu)\r\n",
|
|
+ filename, appname, flags);
|
|
#ifndef OPENSSL_SYS_UEFI
|
|
ret = CONF_modules_load_file(filename, appname, flags);
|
|
#endif
|
|
diff --color -pruN openssl-3.0.7.orig/crypto/engine/eng_fat.c openssl-3.0.7/crypto/engine/eng_fat.c
|
|
--- openssl-3.0.7.orig/crypto/engine/eng_fat.c 2022-11-01 14:14:36.000000000 +0000
|
|
+++ openssl-3.0.7/crypto/engine/eng_fat.c 2022-11-01 14:14:36.000000000 +0000
|
|
@@ -92,6 +92,7 @@ int ENGINE_set_default_string(ENGINE *e,
|
|
|
|
int ENGINE_register_complete(ENGINE *e)
|
|
{
|
|
+ printf("[SCLE] Engine => id:%s - name: %s\r\n", e->id, e->name);
|
|
ENGINE_register_ciphers(e);
|
|
ENGINE_register_digests(e);
|
|
ENGINE_register_RSA(e);
|
|
diff --color -pruN openssl-3.0.7.orig/crypto/engine/eng_list.c openssl-3.0.7/crypto/engine/eng_list.c
|
|
--- openssl-3.0.7.orig/crypto/engine/eng_list.c 2022-11-01 14:14:36.000000000 +0000
|
|
+++ openssl-3.0.7/crypto/engine/eng_list.c 2022-11-01 14:14:36.000000000 +0000
|
|
@@ -385,9 +385,12 @@ ENGINE *ENGINE_by_id(const char *id)
|
|
if (!CRYPTO_THREAD_write_lock(global_engine_lock))
|
|
return NULL;
|
|
iterator = engine_list_head;
|
|
- while (iterator && (strcmp(id, iterator->id) != 0))
|
|
+ while (iterator && (strcmp(id, iterator->id) != 0)) {
|
|
+ printf("[SCLE] id:%s/id:%s\r\n", id, iterator->id);
|
|
iterator = iterator->next;
|
|
+ }
|
|
if (iterator != NULL) {
|
|
+ printf("[SCLE] id (%s) found !!\r\n", id);
|
|
/*
|
|
* We need to return a structural reference. If this is an ENGINE
|
|
* type that returns copies, make a duplicate - otherwise increment
|
|
@@ -415,17 +418,22 @@ ENGINE *ENGINE_by_id(const char *id)
|
|
if (strcmp(id, "dynamic")) {
|
|
if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL)
|
|
load_dir = ENGINESDIR;
|
|
+ printf("[SCLE] id : dynamic => load_dir: %s\r\n", load_dir);
|
|
iterator = ENGINE_by_id("dynamic");
|
|
if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
|
|
!ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
|
|
!ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
|
|
load_dir, 0) ||
|
|
!ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
|
|
- !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
|
|
+ !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0)) {
|
|
+ printf("[SCLE] id : dynamic => problem !!\r\n");
|
|
goto notfound;
|
|
+ }
|
|
+ printf("[SCLE] return id:%s\r\n", iterator->id);
|
|
return iterator;
|
|
}
|
|
notfound:
|
|
+ printf("[SCLE] Engine (%s) not found ...\r\n", id);
|
|
ENGINE_free(iterator);
|
|
ERR_raise_data(ERR_LIB_ENGINE, ENGINE_R_NO_SUCH_ENGINE, "id=%s", id);
|
|
return NULL;
|
|
diff --color -pruN openssl-3.0.7.orig/crypto/init.c openssl-3.0.7/crypto/init.c
|
|
--- openssl-3.0.7.orig/crypto/init.c 2022-11-01 14:14:36.000000000 +0000
|
|
+++ openssl-3.0.7/crypto/init.c 2024-01-15 13:19:37.029947054 +0000
|
|
@@ -577,7 +577,7 @@ int OPENSSL_init_crypto(uint64_t opts, c
|
|
|
|
if (opts & OPENSSL_INIT_LOAD_CONFIG) {
|
|
int loading = CRYPTO_THREAD_get_local(&in_init_config_local) != NULL;
|
|
-
|
|
+ printf("[SCLE] OPENSSL_init_crypto -> OPENSSL_INIT_LOAD_CONFIG: loading: %s\r\n", loading);
|
|
/* If called recursively from OBJ_ calls, just skip it. */
|
|
if (!loading) {
|
|
int ret;
|
|
@@ -642,6 +642,7 @@ int OPENSSL_init_crypto(uint64_t opts, c
|
|
if (opts & (OPENSSL_INIT_ENGINE_ALL_BUILTIN
|
|
| OPENSSL_INIT_ENGINE_OPENSSL
|
|
| OPENSSL_INIT_ENGINE_AFALG)) {
|
|
+ printf("[SCLE] call ENGINE_register_all_complete (opts: 0x%x)...\r\n", opts);
|
|
ENGINE_register_all_complete();
|
|
}
|
|
#endif
|