[gentoo-commits] repo/proj/libressl:master commit in: app-crypt/qca/files/

["Stefan Strogin" <steils@gentoo.org>]

commit:     3e69b18db758fe808a7bcdf339504c80a84cb241
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 14:33:40 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 14:33:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e69b18d

app-crypt/qca: update patch for LibreSSL 3.0.x support

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 app-crypt/qca/files/qca-2.2.0-libressl.patch | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app-crypt/qca/files/qca-2.2.0-libressl.patch b/app-crypt/qca/files/qca-2.2.0-libressl.patch
index f4c2f01..537dd11 100644
--- a/app-crypt/qca/files/qca-2.2.0-libressl.patch
+++ b/app-crypt/qca/files/qca-2.2.0-libressl.patch
@@ -1,6 +1,6 @@
-From bfc0dd038fea35f004867867935eb695b958f849 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Fri, 5 Apr 2019 09:17:23 +0300
+From 3cfe5c3a7cfbf0b7351dedb64785b837667fc0b1 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 2 Oct 2019 17:28:44 +0300
 Subject: [PATCH] Fix build with LibreSSL
 
 Provide RSA_meth_set_{sign,verify} for LibreSSL.
@@ -8,14 +8,14 @@ Do not redefine M_ASN1_IA5STRING_new and RSA_F_RSA_EAY_PRIVATE_DECRYPT.
 Disable HKDF.
 
 Upstream-Status: Submitted [https://phabricator.kde.org/D20259]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
 ---
- plugins/qca-ossl/ossl110-compat.h | 34 ++++++++++++++++---------------
+ plugins/qca-ossl/ossl110-compat.h | 35 +++++++++++++++++--------------
  plugins/qca-ossl/qca-ossl.cpp     | 10 ++++-----
- 2 files changed, 23 insertions(+), 21 deletions(-)
+ 2 files changed, 24 insertions(+), 21 deletions(-)
 
 diff --git a/plugins/qca-ossl/ossl110-compat.h b/plugins/qca-ossl/ossl110-compat.h
-index b320707..d093e50 100644
+index b320707..0a8b49b 100644
 --- a/plugins/qca-ossl/ossl110-compat.h
 +++ b/plugins/qca-ossl/ossl110-compat.h
 @@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, con
@@ -41,11 +41,12 @@ index b320707..d093e50 100644
  static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
  {
      if (!meth) return 0;
-@@ -272,4 +256,22 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
+@@ -272,4 +256,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
  
  #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
  
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000fL)
 +static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
 +    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
 +{
@@ -111,5 +112,5 @@ index 11ecdc9..75c48fc 100644
  			return new opensslHkdfContext( this, type );
  #endif
 -- 
-2.21.0
+2.23.0