diff options
Diffstat (limited to 'security/xmlsec1/files')
| -rw-r--r-- | security/xmlsec1/files/patch-Makefile.in | 4 | ||||
| -rw-r--r-- | security/xmlsec1/files/patch-apps-xmlsec.c | 11 | ||||
| -rw-r--r-- | security/xmlsec1/files/patch-src-openssl-app.c | 22 |
3 files changed, 13 insertions, 24 deletions
diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in index 250d09d1d46d..be5659c14e62 100644 --- a/security/xmlsec1/files/patch-Makefile.in +++ b/security/xmlsec1/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2022-05-06 17:33:38 UTC +--- Makefile.in.orig 2022-12-06 14:04:01 UTC +++ Makefile.in -@@ -490,7 +490,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ +@@ -491,7 +491,7 @@ pkgconfigdir = $(prefix)/libdata/pkgconfig bin_SCRIPTS = xmlsec1-config pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ pkgconfigdir = $(prefix)/libdata/pkgconfig diff --git a/security/xmlsec1/files/patch-apps-xmlsec.c b/security/xmlsec1/files/patch-apps-xmlsec.c deleted file mode 100644 index ce1c62f81e60..000000000000 --- a/security/xmlsec1/files/patch-apps-xmlsec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/xmlsec.c.orig 2022-05-03 14:36:17 UTC -+++ apps/xmlsec.c -@@ -1210,7 +1210,7 @@ int main(int argc, const char **argv) { - (xmlSecAppCmdLineParamGetInt(&repeatParam, 1) > 0)) { - - repeats = xmlSecAppCmdLineParamGetInt(&repeatParam, 1); -- fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (1000 * total_time) / CLOCKS_PER_SEC); -+ fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (long)(1000 * total_time) / CLOCKS_PER_SEC); - } - - goto success; 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: |