summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Strogin <steils@gentoo.org>2020-11-24 11:27:13 +0200
committerStefan Strogin <steils@gentoo.org>2020-11-24 12:38:49 +0200
commitc7792db235647a6441b315528997b40ba2beeaaa (patch)
treed5576aba1db014f000d7975f8f3677bcc64b11fd /app-crypt/trousers/files/trousers-0.3.15-libressl.patch
parentwww-servers/tomcat: bump to 9.0.40 (diff)
downloadgentoo-c7792db235647a6441b315528997b40ba2beeaaa.tar.gz
gentoo-c7792db235647a6441b315528997b40ba2beeaaa.tar.bz2
gentoo-c7792db235647a6441b315528997b40ba2beeaaa.zip
app-crypt/trousers: add patch for LibreSSL
Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Stefan Strogin <steils@gentoo.org>
Diffstat (limited to 'app-crypt/trousers/files/trousers-0.3.15-libressl.patch')
-rw-r--r--app-crypt/trousers/files/trousers-0.3.15-libressl.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
new file mode 100644
index 000000000000..e4aee00d8d97
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
@@ -0,0 +1,31 @@
+From 88e90ee4c36f0decdf7c15e271bccb8b0809a21a Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan@steils.org>
+Date: Tue, 24 Nov 2020 11:08:13 +0200
+Subject: [PATCH] trousers: do not re-declare RSA_set0_key with LibreSSL
+
+The method RSA_set0_key is provided by LibreSSL since 2.7.0, that means
+in all currently supported versions.
+
+Upstream-Status: Submitted
+[https://sourceforge.net/p/trousers/trousers/merge-requests/2/]
+Signed-off-by: Stefan Strogin <stefan@steils.org>
+---
+ src/trspi/crypto/openssl/rsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
+index 24f13e7..cf46c08 100644
+--- a/src/trspi/crypto/openssl/rsa.c
++++ b/src/trspi/crypto/openssl/rsa.c
+@@ -38,7 +38,7 @@
+ #define DEBUG_print_openssl_errors()
+ #endif
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100001L)
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
+--
+2.29.2
+