diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-13 13:42:55 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 01:30:54 +0200 |
| commit | 37215efeea7a255e6a0d72bd8f39d476735cc94a (patch) | |
| tree | 3fc548a9bbe3ad7b26be47b8c02f9d58620ebb7d /src | |
| parent | d5ed6936be137fcb59290b591b46a88e12c34dcd (diff) | |
Ensure that bootstrapped users of QCryptographicHash only use SHA-1
This reduces code size quite considerably in the bootstrapped tools.
Change-Id: I7475650b1936e93afcf327cb4def2f7763609179
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qcryptographichash.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 55195ecd6b..f4f465a623 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -45,6 +45,10 @@ #include "../../3rdparty/sha1/sha1.cpp" +#if defined(QT_BOOTSTRAPPED) && !defined(QT_CRYPTOGRAPHICHASH_ONLY_SHA1) +# error "Are you sure you need the other hashing algorithms besides SHA-1?" +#endif + #ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1 // qdoc and qmake only need SHA-1 #include "../../3rdparty/md5/md5.h" diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index d4e75c4667..c4f7c3ab4a 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -55,9 +55,12 @@ class Q_CORE_EXPORT QCryptographicHash { public: enum Algorithm { +#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1 Md4, Md5, - Sha1, +#endif + Sha1 = 2, +#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1 Sha224, Sha256, Sha384, @@ -66,6 +69,7 @@ public: Sha3_256, Sha3_384, Sha3_512 +#endif }; explicit QCryptographicHash(Algorithm method); |