Update qca-qt5 to 2.3.5

This commit is contained in:
rsadowski 2022-10-26 06:29:16 +00:00
parent 8d2a4eb449
commit 069fe9245b
4 changed files with 13 additions and 13 deletions

View File

@ -1,11 +1,11 @@
COMMENT = Qt Cryptographic Architecture
V = 2.3.4
V = 2.3.5
DISTNAME = qca-${V}
PKGNAME = qca-qt5-${V}
CATEGORIES = security
SHARED_LIBS = qca-qt5 1.0
SHARED_LIBS = qca-qt5 2.0
HOMEPAGE = https://userbase.kde.org/QCA

View File

@ -1,2 +1,2 @@
SHA256 (qca-2.3.4.tar.xz) = a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ=
SIZE (qca-2.3.4.tar.xz) = 737072
SHA256 (qca-2.3.5.tar.xz) = kffZFqs2kr9ZkfClU7+BUxYb/doUvQBdSAorTjhDYug=
SIZE (qca-2.3.5.tar.xz) = 741036

View File

@ -3,7 +3,7 @@ LibreSSL 3.0.x support from Stefan Strogin <steils@gentoo.org>
Index: plugins/qca-ossl/qca-ossl.cpp
--- plugins/qca-ossl/qca-ossl.cpp.orig
+++ plugins/qca-ossl/qca-ossl.cpp
@@ -44,7 +44,13 @@
@@ -45,7 +45,13 @@
#include <openssl/provider.h>
#endif
@ -17,7 +17,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
using namespace QCA;
@@ -1254,6 +1260,7 @@ class opensslPbkdf2Context : public KDFContext (public
@@ -1259,6 +1265,7 @@ class opensslPbkdf2Context : public KDFContext (public
protected:
};
@ -25,7 +25,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
class opensslHkdfContext : public HKDFContext
{
Q_OBJECT
@@ -1286,6 +1293,7 @@ class opensslHkdfContext : public HKDFContext (public)
@@ -1291,6 +1298,7 @@ class opensslHkdfContext : public HKDFContext (public)
return out;
}
};
@ -33,7 +33,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
class opensslHMACContext : public MACContext
{
@@ -4993,7 +5001,11 @@ class MyTLSContext : public TLSContext (public)
@@ -5000,7 +5008,11 @@ class MyTLSContext : public TLSContext (public)
case TLS::TLS_v1:
ctx = SSL_CTX_new(TLS_client_method());
SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
@ -45,7 +45,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
break;
case TLS::DTLS_v1:
default:
@@ -5014,7 +5026,11 @@ class MyTLSContext : public TLSContext (public)
@@ -5021,7 +5033,11 @@ class MyTLSContext : public TLSContext (public)
QStringList cipherList;
for (int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
@ -57,7 +57,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
}
sk_SSL_CIPHER_free(sk);
@@ -5387,7 +5403,11 @@ class MyTLSContext : public TLSContext (public)
@@ -5394,7 +5410,11 @@ class MyTLSContext : public TLSContext (public)
sessInfo.version = TLS::TLS_v1;
}
@ -69,7 +69,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits));
@@ -6687,7 +6707,9 @@ class opensslProvider : public Provider (public)
@@ -6696,7 +6716,9 @@ class opensslProvider : public Provider (public)
#endif
list += QStringLiteral("pbkdf1(sha1)");
list += QStringLiteral("pbkdf2(sha1)");
@ -79,7 +79,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
list += QStringLiteral("pkey");
list += QStringLiteral("dlgroup");
list += QStringLiteral("rsa");
@@ -6756,8 +6778,10 @@ class opensslProvider : public Provider (public)
@@ -6765,8 +6787,10 @@ class opensslProvider : public Provider (public)
#endif
else if (type == QLatin1String("pbkdf2(sha1)"))
return new opensslPbkdf2Context(this, type);

View File

@ -1,7 +1,7 @@
Index: unittest/CMakeLists.txt
--- unittest/CMakeLists.txt.orig
+++ unittest/CMakeLists.txt
@@ -26,7 +26,7 @@ add_subdirectory(keystore)
@@ -23,7 +23,7 @@ add_subdirectory(keystore)
add_subdirectory(logger)
add_subdirectory(macunittest)
add_subdirectory(metatype)