mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-12 08:01:50 +00:00
qca2: add patch to build with libressl 2.3
This commit is contained in:
parent
501d49ebc4
commit
562ba76975
pkgs/development/libraries/qca2
|
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
patches = [ ./libressl.patch ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Qt Cryptographic Architecture";
|
description = "Qt Cryptographic Architecture";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
|
|
28
pkgs/development/libraries/qca2/libressl.patch
Normal file
28
pkgs/development/libraries/qca2/libressl.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:34:25.810682094 +0000
|
||||||
|
+++ b/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:29:51.720392423 +0000
|
||||||
|
@@ -5403,11 +5403,13 @@
|
||||||
|
ctx = SSL_CTX_new(SSLv2_client_method());
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
+#ifndef OPENSSL_NO_SSL3
|
||||||
|
case TLS::SSL_v3:
|
||||||
|
ctx = SSL_CTX_new(SSLv3_client_method());
|
||||||
|
break;
|
||||||
|
+#endif
|
||||||
|
case TLS::TLS_v1:
|
||||||
|
+ ctx = SSL_CTX_new(SSLv23_client_method());
|
||||||
|
- ctx = SSL_CTX_new(TLSv1_client_method());
|
||||||
|
break;
|
||||||
|
case TLS::DTLS_v1:
|
||||||
|
default:
|
||||||
|
@@ -7133,8 +7135,10 @@
|
||||||
|
return new opensslInfoContext(this);
|
||||||
|
else if ( type == "sha1" )
|
||||||
|
return new opensslHashContext( EVP_sha1(), this, type);
|
||||||
|
+#ifndef OPENSSL_NO_SHA0
|
||||||
|
else if ( type == "sha0" )
|
||||||
|
return new opensslHashContext( EVP_sha(), this, type);
|
||||||
|
+#endif
|
||||||
|
else if ( type == "ripemd160" )
|
||||||
|
return new opensslHashContext( EVP_ripemd160(), this, type);
|
||||||
|
#ifdef HAVE_OPENSSL_MD2
|
Loading…
Reference in a new issue