svn commit: r420303 - in head/devel/qca: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Tue Aug 16 20:36:05 UTC 2016
Author: rakuco
Date: Tue Aug 16 20:36:03 2016
New Revision: 420303
URL: https://svnweb.freebsd.org/changeset/ports/420303
Log:
Adjust the SHA0 removal patch.
The upstream fix was still returning "sha0" in all_hash_types() even when SHA0
support is not present. The fix has also been submitted upstream.
PR: 211833
Submitted by: matthew at reztek.cz
MFH: 2016Q3
Modified:
head/devel/qca/Makefile
head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
Modified: head/devel/qca/Makefile
==============================================================================
--- head/devel/qca/Makefile Tue Aug 16 20:06:26 2016 (r420302)
+++ head/devel/qca/Makefile Tue Aug 16 20:36:03 2016 (r420303)
@@ -3,6 +3,7 @@
PORTNAME= qca
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= KDE/stable/qca/${PORTVERSION}/src
Modified: head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
==============================================================================
--- head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Tue Aug 16 20:06:26 2016 (r420302)
+++ head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Tue Aug 16 20:36:03 2016 (r420303)
@@ -19,6 +19,10 @@ version SHA-1.'
REVIEW: 125387
+Also includes:
+qca-ossl: Remove SHA0 from all_hash_types() when it is not available.
+https://git.reviewboard.kde.org/r/128700/
+
--- plugins/qca-ossl/qca-ossl.cpp.orig 2015-10-02 09:39:21 UTC
+++ plugins/qca-ossl/qca-ossl.cpp
@@ -5403,9 +5403,11 @@ public:
@@ -46,7 +50,17 @@ REVIEW: 125387
if (ssl->version == TLS1_VERSION)
sessInfo.version = TLS::TLS_v1;
-@@ -7133,8 +7139,10 @@ public:
+@@ -6880,7 +6886,9 @@ static QStringList all_hash_types()
+ {
+ QStringList list;
+ list += "sha1";
++#ifdef HAVE_OPENSSL_SHA0
+ list += "sha0";
++#endif
+ list += "ripemd160";
+ #ifdef HAVE_OPENSSL_MD2
+ list += "md2";
+@@ -7133,8 +7141,10 @@ public:
return new opensslInfoContext(this);
else if ( type == "sha1" )
return new opensslHashContext( EVP_sha1(), this, type);
More information about the svn-ports-all
mailing list