From 8b59fa8e44781b9543a4b70b576c1a53ca98a909 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 19 Mar 2016 09:00:15 +0100 Subject: [PATCH] qt5: unbreak build with nss>=3.23. --- srcpkgs/qt5/patches/libressl-compat.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/srcpkgs/qt5/patches/libressl-compat.patch b/srcpkgs/qt5/patches/libressl-compat.patch index cc6d3aadbe..90ddc53626 100644 --- a/srcpkgs/qt5/patches/libressl-compat.patch +++ b/srcpkgs/qt5/patches/libressl-compat.patch @@ -36,3 +36,16 @@ to disable that code for libressl. if (nid == 0 && q_SSLeay() >= 0x10002000L) nid = q_EC_curve_nist2nid(curveNameLatin1.data()); #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L +--- qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c.orig 2016-03-19 08:55:45.519280715 +0100 ++++ qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c 2016-03-19 08:58:17.419007495 +0100 +@@ -2088,8 +2088,8 @@ ssl3_ChaCha20Poly1305( + param.len = sizeof(aeadParams); + param.data = (unsigned char *) &aeadParams; + memset(&aeadParams, 0, sizeof(aeadParams)); +- aeadParams.pIv = (unsigned char *) additionalData; +- aeadParams.ulIvLen = 8; ++ aeadParams.pNonce = (unsigned char *) additionalData; ++ aeadParams.ulNonceLen = 8; + aeadParams.pAAD = (unsigned char *) additionalData; + aeadParams.ulAADLen = additionalDataLen; + aeadParams.ulTagLen = tagSize;