77 lines
3.4 KiB
Diff
77 lines
3.4 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 2022-11-01 14:14:36.000000000 +0000
|
|
@@ -43,7 +43,7 @@ void OPENSSL_config(const char *appname)
|
|
|
|
int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
|
|
{
|
|
- printf("[SCLE] ossl_config_int");
|
|
+ printf("[SCLE] ossl_config_int\r\n");
|
|
int ret = 0;
|
|
#if defined(OPENSSL_INIT_DEBUG) || !defined(OPENSSL_SYS_UEFI)
|
|
const char *filename;
|
|
@@ -52,7 +52,7 @@ int ossl_config_int(const OPENSSL_INIT_S
|
|
#endif
|
|
|
|
if (openssl_configured) {
|
|
- printf("[SCLE] ossl_config_int -> openssl_configured");
|
|
+ printf("[SCLE] ossl_config_int -> openssl_configured\r\n");
|
|
return 1;
|
|
}
|
|
|
|
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 2024-01-17 10:46:03.471272607 +0000
|
|
@@ -386,11 +386,11 @@ ENGINE *ENGINE_by_id(const char *id)
|
|
return NULL;
|
|
iterator = engine_list_head;
|
|
while (iterator && (strcmp(id, iterator->id) != 0)) {
|
|
- printf("[SCLE] id:%s/id:%s\r\n", id, iterator->id);
|
|
+ printf("[SCLE - ENGINE_by_id] id:%s/id:%s\r\n", id, iterator->id);
|
|
iterator = iterator->next;
|
|
}
|
|
if (iterator != NULL) {
|
|
- printf("[SCLE] id (%s) found !!\r\n", id);
|
|
+ printf("[SCLE - ENGINE_by_id] 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
|
|
@@ -410,15 +410,17 @@ ENGINE *ENGINE_by_id(const char *id)
|
|
}
|
|
}
|
|
CRYPTO_THREAD_unlock(global_engine_lock);
|
|
- if (iterator != NULL)
|
|
+ if (iterator != NULL) {
|
|
+ printf("[SCLE - ENGINE_by_id] return iterator\r\n");
|
|
return iterator;
|
|
+ }
|
|
/*
|
|
* Prevent infinite recursion if we're looking for the dynamic engine.
|
|
*/
|
|
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);
|
|
+ printf("[SCLE - ENGINE_by_id] 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) ||
|
|
@@ -426,14 +428,14 @@ ENGINE *ENGINE_by_id(const char *id)
|
|
load_dir, 0) ||
|
|
!ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
|
|
!ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0)) {
|
|
- printf("[SCLE] id : dynamic => problem !!\r\n");
|
|
+ printf("[SCLE - ENGINE_by_id] id : dynamic => problem !!\r\n");
|
|
}
|
|
goto notfound;
|
|
- printf("[SCLE] return id:%s\r\n", iterator->id);
|
|
+ printf("[SCLE - ENGINE_by_id] return id:%s\r\n", iterator->id);
|
|
return iterator;
|
|
}
|
|
notfound:
|
|
- printf("[SCLE] Engine (%s) not found ...\r\n", id);
|
|
+ printf("[SCLE - ENGINE_by_id] 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;
|