[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qca] plugins/qca-ossl: qca-ossl: Remove SHA0 from all_hash_types() when it is not available.
From:       Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date:       2016-08-18 6:53:53
Message-ID: E1baHD7-00041G-9F () code ! kde ! org
[Download RAW message or body]

Git commit 84f53aea250556af36759fd44cb68af7f6e6a015 by Raphael Kubo da Costa.
Committed on 18/08/2016 at 06:52.
Pushed by rkcosta into branch 'master'.

qca-ossl: Remove SHA0 from all_hash_types() when it is not available.

Commit 0dbed8e ("qca-ossl: Fix build without support for SHA-0") forgot
to add an #ifdef check for SHA0 support in all_hash_types().

REVIEW: 128700

M  +2    -0    plugins/qca-ossl/qca-ossl.cpp

http://commits.kde.org/qca/84f53aea250556af36759fd44cb68af7f6e6a015

diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
index 61d9e43..f0b9431 100644
--- a/plugins/qca-ossl/qca-ossl.cpp
+++ b/plugins/qca-ossl/qca-ossl.cpp
@@ -6882,7 +6882,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";
[prev in list] [next in list] [prev in thread] [next in thread]