diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2024-02-13 18:36:59 +0300 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2024-02-13 18:36:59 +0300 |
| commit | 61f0255bbe1b64f3e3d4f95a839d9a1f5c535735 (patch) | |
| tree | e78cf13d8a070477c07960b3a3336fd21a345908 /security/xmlsec1/files/patch-src-openssl-app.c | |
| parent | devel/boost: bump consumers after library update (diff) | |
security/xmlsec1: update to 1.3.2 release (+)
It's a minimal requirement for upcoming LibreOffice
With hat: office
Diffstat (limited to 'security/xmlsec1/files/patch-src-openssl-app.c')
| -rw-r--r-- | security/xmlsec1/files/patch-src-openssl-app.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c index bbb25c3f4030..e20b9da3e1ca 100644 --- a/security/xmlsec1/files/patch-src-openssl-app.c +++ b/security/xmlsec1/files/patch-src-openssl-app.c @@ -1,8 +1,8 @@ ---- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC +--- src/openssl/app.c.orig 2023-10-30 22:27:05 UTC +++ src/openssl/app.c -@@ -46,6 +46,29 @@ - +@@ -59,6 +59,29 @@ #include "../cast_helpers.h" + #include "private.h" +#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) +static UI_METHOD * @@ -30,7 +30,7 @@ static int xmlSecOpenSSLDefaultPasswordCallback (char *buf, int bufsiz, int verify, -@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, +@@ -490,6 +513,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, EVP_PKEY* pKey = NULL; int engineInit = 0; int ret; @@ -42,7 +42,7 @@ xmlSecAssert2(engineName != NULL, NULL); xmlSecAssert2(engineKeyId != NULL, NULL); -@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, +@@ -538,7 +566,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, } } @@ -51,16 +51,7 @@ xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL); goto done; } -@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, - - /* load private key */ - pKey = ENGINE_load_private_key(engine, engineKeyId, -- (UI_METHOD *)UI_null(), -+ (UI_METHOD *)ui_null, - NULL); - if(pKey == NULL) { - xmlSecOpenSSLError("ENGINE_load_private_key", NULL); -@@ -534,6 +562,7 @@ done: +@@ -601,6 +629,7 @@ done: data = NULL; done: |