| 1 |
commit: 3e69b18db758fe808a7bcdf339504c80a84cb241 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 2 14:33:40 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 2 14:33:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e69b18d |
| 7 |
|
| 8 |
app-crypt/qca: update patch for LibreSSL 3.0.x support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 11 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 12 |
|
| 13 |
app-crypt/qca/files/qca-2.2.0-libressl.patch | 21 +++++++++++---------- |
| 14 |
1 file changed, 11 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-crypt/qca/files/qca-2.2.0-libressl.patch b/app-crypt/qca/files/qca-2.2.0-libressl.patch |
| 17 |
index f4c2f01..537dd11 100644 |
| 18 |
--- a/app-crypt/qca/files/qca-2.2.0-libressl.patch |
| 19 |
+++ b/app-crypt/qca/files/qca-2.2.0-libressl.patch |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
-From bfc0dd038fea35f004867867935eb695b958f849 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Stefan Strogin <stefan.strogin@×××××.com> |
| 23 |
-Date: Fri, 5 Apr 2019 09:17:23 +0300 |
| 24 |
+From 3cfe5c3a7cfbf0b7351dedb64785b837667fc0b1 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Stefan Strogin <steils@g.o> |
| 26 |
+Date: Wed, 2 Oct 2019 17:28:44 +0300 |
| 27 |
Subject: [PATCH] Fix build with LibreSSL |
| 28 |
|
| 29 |
Provide RSA_meth_set_{sign,verify} for LibreSSL. |
| 30 |
@@ -8,14 +8,14 @@ Do not redefine M_ASN1_IA5STRING_new and RSA_F_RSA_EAY_PRIVATE_DECRYPT. |
| 31 |
Disable HKDF. |
| 32 |
|
| 33 |
Upstream-Status: Submitted [https://phabricator.kde.org/D20259] |
| 34 |
-Signed-off-by: Stefan Strogin <stefan.strogin@×××××.com> |
| 35 |
+Signed-off-by: Stefan Strogin <steils@g.o> |
| 36 |
--- |
| 37 |
- plugins/qca-ossl/ossl110-compat.h | 34 ++++++++++++++++--------------- |
| 38 |
+ plugins/qca-ossl/ossl110-compat.h | 35 +++++++++++++++++-------------- |
| 39 |
plugins/qca-ossl/qca-ossl.cpp | 10 ++++----- |
| 40 |
- 2 files changed, 23 insertions(+), 21 deletions(-) |
| 41 |
+ 2 files changed, 24 insertions(+), 21 deletions(-) |
| 42 |
|
| 43 |
diff --git a/plugins/qca-ossl/ossl110-compat.h b/plugins/qca-ossl/ossl110-compat.h |
| 44 |
-index b320707..d093e50 100644 |
| 45 |
+index b320707..0a8b49b 100644 |
| 46 |
--- a/plugins/qca-ossl/ossl110-compat.h |
| 47 |
+++ b/plugins/qca-ossl/ossl110-compat.h |
| 48 |
@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, con |
| 49 |
@@ -41,11 +41,12 @@ index b320707..d093e50 100644 |
| 50 |
static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) |
| 51 |
{ |
| 52 |
if (!meth) return 0; |
| 53 |
-@@ -272,4 +256,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) |
| 54 |
+@@ -272,4 +256,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) |
| 55 |
|
| 56 |
#endif // OPENSSL_VERSION_NUMBER < 0x10100000L |
| 57 |
|
| 58 |
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
| 59 |
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ |
| 60 |
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000fL) |
| 61 |
+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m, |
| 62 |
+ unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)) |
| 63 |
+{ |
| 64 |
@@ -111,5 +112,5 @@ index 11ecdc9..75c48fc 100644 |
| 65 |
return new opensslHkdfContext( this, type ); |
| 66 |
#endif |
| 67 |
-- |
| 68 |
-2.21.0 |
| 69 |
+2.23.0 |
Archives