svn commit: r418048 - head/devel/qca/files
Bernard Spil
brnrd at FreeBSD.org
Mon Jul 4 18:14:19 UTC 2016
Author: brnrd
Date: Mon Jul 4 18:14:18 2016
New Revision: 418048
URL: https://svnweb.freebsd.org/changeset/ports/418048
Log:
devel/qca: Fix build failure on 9.3 / OpenSSL 0.9.7
- Re-add patch for compression to satisfy 0.9.7
PR: 210053
Modified:
head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
Modified: head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp
==============================================================================
--- head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Mon Jul 4 18:02:21 2016 (r418047)
+++ head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Mon Jul 4 18:14:18 2016 (r418048)
@@ -1,27 +1,27 @@
-qca-ossl: Fix build without SSLv3
+qca-ossl: Fix build without SSLv3
http://quickgit.kde.org/?p=qca.git&a=commit&h=20a587d77636186edb044cd2b71d6d90fe98d232
-This fixes building with LibreSSL >= 2.3.0 which has removed support
-for SSLv3 completely. As far as I know OpenSSL can be configured to
-build without it, so it might be helpful there as well.
+This fixes building with LibreSSL >= 2.3.0 which has removed support
+for SSLv3 completely. As far as I know OpenSSL can be configured to
+build without it, so it might be helpful there as well.
-REVIEW: 125386
+REVIEW: 125386
-qca-ossl: Fix build without support for SHA-0
+qca-ossl: Fix build without support for SHA-0
https://quickgit.kde.org/?p=qca.git&a=commit&h=0dbed8eb38afd1561907a52283091c37e7b85156
-LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha
-anymore.
-Wikipedia says about SHA-0: "160-bit hash function published in 1993
-under the name SHA. It was withdrawn shortly after publication due to
-an undisclosed "significant flaw" and replaced by the slightly revised
-version SHA-1.'
+LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha
+anymore.
+Wikipedia says about SHA-0: "160-bit hash function published in 1993
+under the name SHA. It was withdrawn shortly after publication due to
+an undisclosed "significant flaw" and replaced by the slightly revised
+version SHA-1.'
-REVIEW: 125387
+REVIEW: 125387
---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-07-03 11:34:48 UTC
+--- plugins/qca-ossl/qca-ossl.cpp.orig 2015-10-02 09:39:21 UTC
+++ plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@
+@@ -5403,9 +5403,11 @@ public:
ctx = SSL_CTX_new(SSLv2_client_method());
break;
#endif
@@ -33,7 +33,20 @@ REVIEW: 125387
case TLS::TLS_v1:
ctx = SSL_CTX_new(TLSv1_client_method());
break;
-@@ -7135,8 +7135,10 @@
+@@ -5805,7 +5807,11 @@ public:
+ {
+ SessionInfo sessInfo;
+
+- sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session));
++#ifndef OPENSSL_NO_COMP
++ sessInfo.isCompressed = (0 != ssl->session->compress_meth);
++#else
++ sessInfo.isCompressed = 0;
++#endif
+
+ if (ssl->version == TLS1_VERSION)
+ sessInfo.version = TLS::TLS_v1;
+@@ -7133,8 +7139,10 @@ public:
return new opensslInfoContext(this);
else if ( type == "sha1" )
return new opensslHashContext( EVP_sha1(), this, type);
More information about the svn-ports-head
mailing list