Simple update to the latest stable version. LibreSSL patch update from
Stefan Strogin (Gentoo). No dynamic export changes.
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/qca-qt5/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 29 Jun 2020 05:07:55 -0000 1.7
+++ Makefile 10 Sep 2020 04:59:42 -0000
@@ -2,7 +2,7 @@
# separate port for Qt5 because it's too different from Qt4 case
COMMENT = Qt Cryptographic Architecture
-V = 2.3.0
+V = 2.3.1
DISTNAME = qca-${V}
PKGNAME = qca-qt5-${V}
CATEGORIES = security
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/qca-qt5/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 29 Jun 2020 05:07:55 -0000 1.3
+++ distinfo 10 Sep 2020 04:59:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (qca-2.3.0.tar.xz) = HWjvQaG2Hcl4a+uSOmiQKmJ2p3zO1eXqf/mF7xE5Mtc=
-SIZE (qca-2.3.0.tar.xz) = 729504
+SHA256 (qca-2.3.1.tar.xz) = wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks=
+SIZE (qca-2.3.1.tar.xz) = 725984
Index: patches/patch-plugins_qca-ossl_qca-ossl_cpp
===================================================================
RCS file:
/cvs/ports/security/qca-qt5/patches/patch-plugins_qca-ossl_qca-ossl_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-plugins_qca-ossl_qca-ossl_cpp
--- patches/patch-plugins_qca-ossl_qca-ossl_cpp 29 Jun 2020 05:07:56 -0000
1.2
+++ patches/patch-plugins_qca-ossl_qca-ossl_cpp 10 Sep 2020 04:59:42 -0000
@@ -19,7 +19,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
using namespace QCA;
-@@ -1255,6 +1261,7 @@ class opensslPbkdf2Context : public KDFContext (public
+@@ -1262,6 +1268,7 @@ class opensslPbkdf2Context : public KDFContext (public
protected:
};
@@ -27,7 +27,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
class opensslHkdfContext : public HKDFContext
{
Q_OBJECT
-@@ -1284,6 +1291,7 @@ class opensslHkdfContext : public HKDFContext (public)
+@@ -1291,6 +1298,7 @@ class opensslHkdfContext : public HKDFContext (public)
return out;
}
};
@@ -35,7 +35,43 @@ Index: plugins/qca-ossl/qca-ossl.cpp
class opensslHMACContext : public MACContext
{
-@@ -7268,7 +7276,9 @@ class opensslProvider : public Provider (public)
+@@ -4990,7 +4998,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);
++#ifdef TLS1_3_VERSION
+ SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
++#else
++ SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
++#endif
+ break;
+ case TLS::DTLS_v1:
+ default:
+@@ -5011,7 +5023,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);
++#ifndef LIBRESSL_VERSION_NUMBER
+ cipherList +=
QString::fromLatin1(SSL_CIPHER_standard_name(thisCipher));
++#else
++ cipherList +=
QString::fromLatin1(SSL_CIPHER_get_name(thisCipher));
++#endif
+ }
+ sk_SSL_CIPHER_free(sk);
+
+@@ -5404,7 +5420,11 @@ class MyTLSContext : public TLSContext (public)
+ sessInfo.version = TLS::TLS_v1;
+ }
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_standard_name(SSL_get_current_cipher(ssl)));
++#else
++ sessInfo.cipherSuite =
QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
++#endif
+
+ sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl,
&(sessInfo.cipherBits));
+
+@@ -6751,7 +6771,9 @@ class opensslProvider : public Provider (public)
#endif
list += QStringLiteral("pbkdf1(sha1)");
list += QStringLiteral("pbkdf2(sha1)");
@@ -45,7 +81,7 @@ Index: plugins/qca-ossl/qca-ossl.cpp
list += QStringLiteral("pkey");
list += QStringLiteral("dlgroup");
list += QStringLiteral("rsa");
-@@ -7337,8 +7347,10 @@ class opensslProvider : public Provider (public)
+@@ -6820,8 +6842,10 @@ class opensslProvider : public Provider (public)
#endif
else if ( type == QLatin1String("pbkdf2(sha1)") )
return new opensslPbkdf2Context( this, type );
