qca: Move to latest git source to fix builf with OpenSSL 1.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-10-29 11:10:49 +01:00
parent c15ca2595f
commit ff2ef31cd3
2 changed files with 5 additions and 44 deletions

View File

@@ -1,40 +0,0 @@
From 601fd3a05141c614ae48a3ddac44194d669eaae1 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Mon, 27 Jun 2016 12:55:51 +0200
Subject: [PATCH] fix base64 decoding on ARM
This code was broken on ARM and other architectures where "char" is unsigned by
default.
First, it breaks with newer compilers with errors like:
.../src/qca_textfilter.cpp:314:2: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
Second, if the compiler would just allow this conversion then the unsigned char
would hold 255, which would not be sign extended when cast to an int later, so
all the checks "< 0" will never trigger, and so invalid input characters cannot
be detected.
REVIEW:128295
BUG:364495
Upstream-Status: Applied
---
src/qca_textfilter.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qca_textfilter.cpp b/src/qca_textfilter.cpp
index 9889a24..3baf511 100644
--- a/src/qca_textfilter.cpp
+++ b/src/qca_textfilter.cpp
@@ -293,7 +293,7 @@ static QByteArray b64decode(const QByteArray &s, bool *ok)
// 64 specifies eof
// everything else specifies data
- static char tbl[] =
+ static signed char tbl[] =
{
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--
2.5.5

View File

@@ -15,12 +15,13 @@ DEPENDS += " \
pkcs11-helper \
"
SRC_URI[md5sum] = "657cc701316600199199a6b6cb2c73c9"
SRC_URI[sha256sum] = "95de3e7910b5f9ec7084169989c9d98bfb527e6a4865fe17269c3b24308be983"
SRC_URI += " \
SRC_URI = " \
git://github.com/KDE/qca.git \
file://0001-use-pkg-config-to-find-libgcrypt.patch \
file://0002-fix-base64-decoding-on-ARM.patch \
"
SRCREV = "32343842d359a60e3619f97aac983d587f6eca16"
S = "${WORKDIR}/git"
PV = "2.1.3+git${SRCPV}"
EXTRA_OECMAKE += "-DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/features"