diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-03 12:28:13 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 22:24:00 +0100 |
commit | b51296c06433d4923e4dcfd2bc104ae3ab67fb43 (patch) | |
tree | b97cbca6a01d898bce4c93a0cee31687c04fef7a /src/corelib/tools/qcryptographichash.h | |
parent | bc6ad75d18a029da363afc4f6007aefc7962a8ad (diff) |
This adds Sha224, Sha256, Sha384, and Sha512 enum values to
QCryptographicHash::Algorithm. The implementation comes from RFC 6234,
http://tools.ietf.org/html/rfc6234, which is added to
src/3rdparty/rfc6234. Only the headers and SHA-2 code is included in
src/3rdparty/rfc6234 (the SHA1, HMAC, and HKDF code is not included).
Change-Id: I85139fd118291f15efc22899a5ddd1cc83810cfb
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qcryptographichash.h')
-rw-r--r-- | src/corelib/tools/qcryptographichash.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index 59314e1963..2bfc03373a 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -58,7 +58,11 @@ public: enum Algorithm { Md4, Md5, - Sha1 + Sha1, + Sha224, + Sha256, + Sha384, + Sha512 }; QCryptographicHash(Algorithm method); |