summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-02-08 14:07:45 +0100
committerLars Knoll <lars.knoll@qt.io>2016-10-11 06:05:13 +0000
commitdee8b4d6b1d08e8ede98f38e7c972a7d1099d6c1 (patch)
treeab9b800d379451dd6c12ab3cb8d528e966dee3bb
parent8d330f55ba26600b93dda9fdcfacb571cfd1e94b (diff)
Save 100k by not using bloated sha3 code
Probably makes sha3 calculations somewhat slower. Change-Id: Ie082c163b91d4e2282ad68b810e56b2437a1eb8a Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--src/3rdparty/sha3/KeccakF-1600-interface.h4
-rw-r--r--src/corelib/configure.json6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty/sha3/KeccakF-1600-interface.h b/src/3rdparty/sha3/KeccakF-1600-interface.h
index ce2710eeb2..39caaaecbd 100644
--- a/src/3rdparty/sha3/KeccakF-1600-interface.h
+++ b/src/3rdparty/sha3/KeccakF-1600-interface.h
@@ -14,7 +14,11 @@ http://creativecommons.org/publicdomain/zero/1.0/
#ifndef _KeccakPermutationInterface_h_
#define _KeccakPermutationInterface_h_
+#include <private/qglobal_p.h>
+
+#if QT_CONFIG(sha3_fast)
#include "KeccakF-1600-int-set.h"
+#endif
static void KeccakInitialize( void );
static void KeccakInitializeState(unsigned char *state);
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index a471d55dca..d0a3a13e48 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -558,6 +558,12 @@
"purpose": "Provides a framework for gestures.",
"section": "Utilities",
"output": [ "publicFeature", "feature" ]
+ },
+ "sha3-fast": {
+ "label": "Speed optimized SHA3",
+ "purpose": "Optimizes SHA3 for speed instead of size.",
+ "section": "Utilities",
+ "output": [ "privateFeature" ]
}
},