diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2023-02-04 11:23:25 +0300 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2023-02-04 11:23:25 +0300 |
| commit | 645c54e10d3bd939a03d65e87aee074623c333d2 (patch) | |
| tree | f1ff0fd7273f4356c2942c410813ed2283b969b7 /security/xmlsec1/files/patch-src-openssl-app.c | |
| parent | devel/aws-sdk-cpp: Update to 1.11.10 (diff) | |
security/xmlsec1: update to 1.2.37 release (+)
This is a prerequisite for LibreOffcie 7.5 update
News:
1.2.37: Fixed two regressions from 1.2.36 release: issue #437 and issue #449.
1.2.36: Retired the XMLSec mailing list "xmlsec@aleksey.com" and the XMLSec Online Signature Verifier.
Several other small fixes (more details).
1.3.25: Migration to OpenSSL 3.0 API (based on PR by @snargit).
The OpenSSL before 1.1.0 and LibreSSL before 2.7.0 are now deprecated and will be removed in the future versions of XMLSec Library.
Refactored all the integer casts to ensure cast-safety. Fixed all warnings and enabled "-Werror" and "-pedantic" flags on CI builds.
Added configure flag to use size_t for xmlSecSize (currently disabled by default for backward compatibility).
Several other small fixes (more details).
Full Changelog: https://www.aleksey.com/xmlsec/
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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c index c723cad64dad..bbb25c3f4030 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-05-03 23:36:17.000000000 +0900 -+++ src/openssl/app.c 2022-05-07 05:18:46.065103000 +0900 -@@ -43,6 +43,29 @@ +--- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC ++++ src/openssl/app.c +@@ -46,6 +46,29 @@ - #include "openssl_compat.h" + #include "../cast_helpers.h" +#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) +static UI_METHOD * @@ -27,10 +27,10 @@ +} +#endif + - static int xmlSecOpenSSLAppLoadRANDFile (const char *filename); - static int xmlSecOpenSSLAppSaveRANDFile (const char *filename); static int xmlSecOpenSSLDefaultPasswordCallback (char *buf, -@@ -415,6 +438,11 @@ + int bufsiz, + int verify, +@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, EVP_PKEY* pKey = NULL; int engineInit = 0; int ret; @@ -40,9 +40,9 @@ + const UI_METHOD *ui_null = ui_null_create(); +#endif - #ifndef OPENSSL_NO_ENGINE xmlSecAssert2(engineName != NULL, NULL); -@@ -437,7 +465,7 @@ + xmlSecAssert2(engineKeyId != NULL, NULL); +@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, } } @@ -51,7 +51,7 @@ xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL); goto done; } -@@ -453,7 +481,7 @@ +@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, /* load private key */ pKey = ENGINE_load_private_key(engine, engineKeyId, @@ -60,7 +60,7 @@ NULL); if(pKey == NULL) { xmlSecOpenSSLError("ENGINE_load_private_key", NULL); -@@ -484,6 +512,7 @@ +@@ -534,6 +562,7 @@ done: data = NULL; done: |