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

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

[Stefan Strogin]

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
 

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

[orbea]

commit:     9e5c1fc37e18b0c9e8915df30dc76cadc866a35b
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Oct 17 01:19:49 2024 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu Oct 17 01:19:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9e5c1fc3

app-crypt/qca: fix build with LibreSSL 4.0.0

Closes: https://github.com/gentoo/libressl/issues/574
Signed-off-by: orbea <orbea <AT> riseup.net>

 app-crypt/qca/files/qca-2.3.4-libressl.patch | 52 +++++++++++++++++++---------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/app-crypt/qca/files/qca-2.3.4-libressl.patch b/app-crypt/qca/files/qca-2.3.4-libressl.patch
index 8bee8ad..442c1dc 100644
--- a/app-crypt/qca/files/qca-2.3.4-libressl.patch
+++ b/app-crypt/qca/files/qca-2.3.4-libressl.patch
@@ -11,10 +11,10 @@ diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
 index b2c5d3d..79775cd 100644
 --- a/plugins/qca-ossl/qca-ossl.cpp
 +++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -44,7 +44,13 @@
+@@ -45,7 +45,13 @@
  #include <openssl/provider.h>
  #endif
- 
+
 +#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT
 +#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
 +#endif
@@ -22,26 +22,26 @@ index b2c5d3d..79775cd 100644
 +#ifndef LIBRESSL_VERSION_NUMBER
  #include <openssl/kdf.h>
 +#endif
- 
+
  using namespace QCA;
- 
-@@ -1254,6 +1260,7 @@ public:
+
+@@ -1262,6 +1268,7 @@ public:
  protected:
  };
- 
+
 +#ifndef LIBRESSL_VERSION_NUMBER
  class opensslHkdfContext : public HKDFContext
  {
      Q_OBJECT
-@@ -1286,6 +1293,7 @@ public:
+@@ -1294,6 +1301,7 @@ public:
          return out;
      }
  };
 +#endif // LIBRESSL_VERSION_NUMBER
- 
+
  class opensslHMACContext : public MACContext
  {
-@@ -4993,7 +5001,11 @@ public:
+@@ -5004,7 +5012,11 @@ public:
          case TLS::TLS_v1:
              ctx = SSL_CTX_new(TLS_client_method());
              SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
@@ -53,7 +53,7 @@ index b2c5d3d..79775cd 100644
              break;
          case TLS::DTLS_v1:
          default:
-@@ -5014,7 +5026,11 @@ public:
+@@ -5025,7 +5037,11 @@ public:
          QStringList cipherList;
          for (int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
              const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
@@ -64,8 +64,8 @@ index b2c5d3d..79775cd 100644
 +#endif
          }
          sk_SSL_CIPHER_free(sk);
- 
-@@ -5386,8 +5402,11 @@ public:
+
+@@ -5397,8 +5413,11 @@ public:
              qDebug("unexpected version response");
              sessInfo.version = TLS::TLS_v1;
          }
@@ -75,12 +75,21 @@ index b2c5d3d..79775cd 100644
 +#else
 +        sessInfo.cipherSuite = QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
 +#endif
- 
+
          sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits));
- 
-@@ -6687,7 +6706,9 @@ public:
+
+@@ -6460,7 +6479,7 @@ static QStringList all_hash_types()
+         list += QStringLiteral("md2");
+ #endif
+         list += QStringLiteral("md4");
+-#ifdef OBJ_whirlpool
++#if defined(OBJ_whirlpool) && !defined(OPENSSL_NO_WHIRLPOOL)
+         list += QStringLiteral("whirlpool");
  #endif
-         list += QStringLiteral("pbkdf1(sha1)");
+     }
+@@ -6705,7 +6724,9 @@ public:
+         }
+         list += QStringLiteral("pkcs12");
          list += QStringLiteral("pbkdf2(sha1)");
 +#ifndef LIBRESSL_VERSION_NUMBER
          list += QStringLiteral("hkdf(sha256)");
@@ -88,7 +97,7 @@ index b2c5d3d..79775cd 100644
          list += QStringLiteral("pkey");
          list += QStringLiteral("dlgroup");
          list += QStringLiteral("rsa");
-@@ -6756,8 +6777,10 @@ public:
+@@ -6755,8 +6776,10 @@ public:
  #endif
          else if (type == QLatin1String("pbkdf2(sha1)"))
              return new opensslPbkdf2Context(this, type);
@@ -99,5 +108,14 @@ index b2c5d3d..79775cd 100644
          else if (type == QLatin1String("hmac(md5)"))
              return new opensslHMACContext(EVP_md5(), this, type);
          else if (type == QLatin1String("hmac(sha1)"))
+@@ -6921,7 +6944,7 @@ public:
+ #endif
+             else if (type == QLatin1String("md4"))
+                 return new opensslHashContext(EVP_md4(), this, type);
+-#ifdef OBJ_whirlpool
++#if defined(OBJ_whirlpool) && !defined(OPENSSL_NO_WHIRLPOOL)
+             else if (type == QLatin1String("whirlpool"))
+                 return new opensslHashContext(EVP_whirlpool(), this, type);
+ #endif
 -- 
 2.35.1