Skip to content

RDKOSS-612: Resolving improper PKCS#11 ENGINE cleanup to fix the crash. #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muraliselvaraj2020 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKOSS-612: Resolving improper PKCS#11 ENGINE cleanup to fix the crash. #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions recipes-connectivity/openssl/openssl/pkcs11_engine_cleanup_crash_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
Index: openssl-3.0.5/crypto/evp/p_legacy.c
===================================================================
--- openssl-3.0.5.orig/crypto/evp/p_legacy.c
+++ openssl-3.0.5/crypto/evp/p_legacy.c
@@ -65,7 +65,7 @@ int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey,
unsigned char key_id = extract_pkcs11_key_id(key);
if (key_id == 0x2c) {
EC_KEY *loaded_key = NULL;
- loaded_key = (EC_KEY *)load_pkcs11_private_key((void *)&key, PKCS11_KEY_TYPE_EC_KEY);
+ loaded_key = (EC_KEY *)load_pkcs11_private_key((void **)&key, PKCS11_KEY_TYPE_EC_KEY);
if (!loaded_key)
return 0;
key = loaded_key;
Index: openssl-3.0.5/crypto/pkcs11_reference_key.c
===================================================================
--- openssl-3.0.5.orig/crypto/pkcs11_reference_key.c
+++ openssl-3.0.5/crypto/pkcs11_reference_key.c
@@ -114,31 +114,30 @@ EVP_PKEY *load_pkcs11_private_key_intern
engine = ENGINE_by_id("pkcs11");
if (!engine) {
ERR_raise(ERR_LIB_EVP, ERR_R_ENGINE_LIB);
- goto cleanup;
+ return NULL;
}
/* Configure PKCS#11 module path */
if (!ENGINE_ctrl_cmd_string(engine, "MODULE_PATH", PKCS11_MODULE_PATH, 0)) {
ERR_raise(ERR_LIB_EVP, ERR_R_ENGINE_LIB);
- goto cleanup;
+ return NULL;
}
/* Initialize engine */
if (!ENGINE_init(engine)) {
ERR_raise(ERR_LIB_EVP, ERR_R_ENGINE_LIB);
- goto cleanup;
+ return NULL;
}
/* Load private key from PKCS#11 token */
loaded_key = ENGINE_load_private_key(engine, pkcs11_uri, NULL, NULL);
- if (!loaded_key) {
+ if (loaded_key == NULL) {
ERR_raise(ERR_LIB_EVP, ERR_R_ENGINE_LIB);
- goto cleanup;
- }
- cleanup:
- if (engine) {
ENGINE_finish(engine);
ENGINE_free(engine);
}
- OPENSSL_free(pkcs11_uri);
- return loaded_key;
+ else {
+ ENGINE_free(engine);
+ }
+ OPENSSL_free(pkcs11_uri);
+ return loaded_key;
}

/*
Index: openssl-3.0.5/crypto/pkcs12/p12_kiss.c
===================================================================
--- openssl-3.0.5.orig/crypto/pkcs12/p12_kiss.c
+++ openssl-3.0.5/crypto/pkcs12/p12_kiss.c
@@ -113,7 +113,7 @@ int PKCS12_parse(PKCS12 *p12, const char
}
/* Check if parsed key is PKCS#11 reference and load actual key from hardware */
if (pkey && *pkey && is_pkcs11_reference_key(*pkey, PKCS11_KEY_TYPE_EVP_PKEY)) {
- if (!load_pkcs11_private_key(pkey, PKCS11_KEY_TYPE_EVP_PKEY)) {
+ if (!load_pkcs11_private_key((void **)pkey, PKCS11_KEY_TYPE_EVP_PKEY)) {
goto err;
}
}
1 change: 1 addition & 0 deletions recipes-connectivity/openssl/openssl_3.0.%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ EXTRA_OECONF += "no-tls1_1"
SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'enable_canarytool', ' file://openssl-canary-3.0.5.patch', '', d)}"
SRC_URI:append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd logendpoints', bb.utils.contains('DISTRO_FEATURES', 'enable_canarytool', ' file://endpoint-logging-canary-enable-3.0.5.patch', 'file://endpoint-logging-canary-disable-3.0.5.patch', d), '', d)}"
SRC_URI:append = " file://pkcs11_migration_support_p12.patch"
SRC_URI:append = " file://pkcs11_engine_cleanup_crash_fix.patch"

DEPENDS:append:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
LDFLAGS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' -lsystemd ', '', d)}"
Expand Down