1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blake2: Fix MSVC warning C4804

Browse Source 
Change-Id: I392da957b9cc84f55bb8eaeb888ca5dd35ec36f2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 10368c61a97efe9862a73432d0ff3851a12b096b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2021-04-20 14:34:28 +02:00 committed by Qt Cherry-pick Bot
parent 2f82546d4b
commit f8537be746
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/blake2/qt_attribution.json vendored
View File

@ -7,8 +7,8 @@
"Description": "BLAKE2 is a cryptographic hash function faster than MD5, SHA-1, SHA-2, and SHA-3, yet is at least as secure as the latest standard SHA-3.",
"Homepage": "https://blake2.net/",
"Version": "3d6155ab1682e68c30f93064f988247508f55bbe",
"DownloadLocation": "https://github.com/BLAKE2/BLAKE2/tree/3d6155ab1682e68c30f93064f988247508f55bbe",
"Version": "54f4faa4c16ea34bcd59d16e8da46a64b259fc07",
"DownloadLocation": "https://github.com/BLAKE2/BLAKE2/tree/54f4faa4c16ea34bcd59d16e8da46a64b259fc07",
"License": "Creative Commons Zero v1.0 Universal or Apache License 2.0",
"LicenseId": "CC0-1.0 OR Apache-2.0",
"LicenseFile": "COPYING",

4
src/3rdparty/blake2/src/blake2.h vendored
View File

@ -137,8 +137,8 @@ extern "C" {
/* Padded structs result in a compile-time error */
enum {
BLAKE2_DUMMY_1 = 1/(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
BLAKE2_DUMMY_2 = 1/(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
BLAKE2_DUMMY_1 = 1/(int)(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
BLAKE2_DUMMY_2 = 1/(int)(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
};
/* Streaming API */