Skip to content

Fix replace-default patch DSO caching and error handling #388

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
ColtonWilley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix replace-default patch DSO caching and error handling #388

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
24 changes: 13 additions & 11 deletions patches/openssl3-replace-default.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c
index 068e0b7..e9ae469 100644
--- a/crypto/provider_predefined.c
+++ b/crypto/provider_predefined.c
@@ -5,28 +5,67 @@
@@ -5,28 +5,69 @@
* 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
Expand Down Expand Up @@ -32,23 +32,25 @@ index 068e0b7..e9ae469 100644
+ int ret = 0;
+ OSSL_provider_init_fn *wolfssl_provider_init_fn = NULL;
+
+ d = DSO_new();
+ if (!d) {
+ fprintf(stderr, "DSO_new() failed\n");
+ return 1;
+ }
+ d = DSO_new();
+ if (!d) {
+ fprintf(stderr, "DSO_new() failed\n");
+ return 0;
+ }
+
+ if (!DSO_load(d, "wolfprov", NULL, 0)) {
+ fprintf(stderr, "Could not load libwolfprov.so. Is the libwolfprov package installed?\n");
+ DSO_free(d);
+ return 1;
+ if (!DSO_load(d, "wolfprov", NULL, 0)) {
+ fprintf(stderr, "Could not load libwolfprov.so. Is the libwolfprov package installed?\n");
+ DSO_free(d);
+ d = NULL;
+ return 0;
+ }
+ }
+
+ wolfssl_provider_init_fn = (OSSL_provider_init_fn*)DSO_bind_func(d, "wolfssl_provider_init");
+ if (!wolfssl_provider_init_fn) {
+ fprintf(stderr, "Failed to find wolfssl_provider_init symbol\n");
+ DSO_free(d);
+ return 1;
+ return 0;
+ }
+
+ // Intentionally preserve the DSO 'd' here, since it needs to stay loaded
Expand Down
Loading