mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
Code Issues Releases Activity

security/xmlsec1: fix build when using libressl

Browse Source 
PR:	263826
This commit is contained in:
Hiroki Sato 2022-05-07 05:23:19 +09:00
parent 8583bcdcde
commit 29c7d4a9f8
No known key found for this signature in database
GPG Key ID: DBB07DC66F1F737F
1 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
security/xmlsec1/files/patch-src-openssl-app.c Normal file
View File

@ -0,0 +1,70 @@
--- 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 @@
#include "openssl_compat.h"
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
+static UI_METHOD *
+ui_null_create(void)
+{
+ return (UI_create_method("OpenSSL NULL UI"));
+}
+static void
+ui_null_destroy(UI_METHOD *ui)
+{
+ UI_destroy_method(ui);
+}
+#else
+static const UI_METHOD *
+ui_null_create(void)
+{
+ return (UI_null());
+}
+static void
+ui_null_destroy(const UI_METHOD *ui)
+{
+}
+#endif
+
static int xmlSecOpenSSLAppLoadRANDFile (const char *filename);
static int xmlSecOpenSSLAppSaveRANDFile (const char *filename);
static int xmlSecOpenSSLDefaultPasswordCallback (char *buf,
@@ -415,6 +438,11 @@
EVP_PKEY* pKey = NULL;
int engineInit = 0;
int ret;
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
+ UI_METHOD *ui_null = ui_null_create();
+#else
+ const UI_METHOD *ui_null = ui_null_create();
+#endif
#ifndef OPENSSL_NO_ENGINE
xmlSecAssert2(engineName != NULL, NULL);
@@ -437,7 +465,7 @@
}
}
- if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)UI_null(), 0, 1) < 0) {
+ if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)ui_null, 0, 1) < 0) {
xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL);
goto done;
}
@@ -453,7 +481,7 @@
/* 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);
@@ -484,6 +512,7 @@
data = NULL;
done:
+ ui_null_destroy(ui_null);
/* cleanup */
if(pKey != NULL) {
EVP_PKEY_free(pKey);