diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-04-20 14:34:28 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-05-31 08:39:59 +0200 |
| commit | 10368c61a97efe9862a73432d0ff3851a12b096b (patch) | |
| tree | ed265a8ed351bd8ae2b8346df52783854d4ce0bf /src/3rdparty/blake2 | |
| parent | afb9bdc76f29b2634cc8035c8bd8d27564098263 (diff) | |
blake2: Fix MSVC warning C4804
Pick-to: 6.1
Change-Id: I392da957b9cc84f55bb8eaeb888ca5dd35ec36f2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty/blake2')
| -rw-r--r-- | src/3rdparty/blake2/qt_attribution.json | 4 | ||||
| -rw-r--r-- | src/3rdparty/blake2/src/blake2.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/blake2/qt_attribution.json b/src/3rdparty/blake2/qt_attribution.json index 638a6c2ed4..ad1116f53e 100644 --- a/src/3rdparty/blake2/qt_attribution.json +++ b/src/3rdparty/blake2/qt_attribution.json @@ -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", diff --git a/src/3rdparty/blake2/src/blake2.h b/src/3rdparty/blake2/src/blake2.h index ad62f260e7..ca390305e6 100644 --- a/src/3rdparty/blake2/src/blake2.h +++ b/src/3rdparty/blake2/src/blake2.h @@ -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 */ |