diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-13 17:49:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-13 17:49:48 -0400 |
| commit | 3cec1783b7960a37ef51b5dc86dd1492b608f6e7 (patch) | |
| tree | 0fc0cecab03b6cc7b64efddd19ce834696e452bc | |
| parent | 5472066cd21099d406e69ef810b83c153bd21e5b (diff) | |
| download | tor-3cec1783b7960a37ef51b5dc86dd1492b608f6e7.tar.gz tor-3cec1783b7960a37ef51b5dc86dd1492b608f6e7.zip | |
Fix compiler warnings with openssl-scrypt/libscrypt test on clang
Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t. GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.
Fixes bug22916; bugfix on 0.2.7.2-alpha.
| -rw-r--r-- | changes/bug22916_027 | 3 | ||||
| -rw-r--r-- | src/test/test_crypto_slow.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug22916_027 b/changes/bug22916_027 new file mode 100644 index 0000000000..5cf99c7d15 --- /dev/null +++ b/changes/bug22916_027 @@ -0,0 +1,3 @@ + o Minor bugfixes (Compilation): + - Fix warnings when building with libscrypt and openssl scrypt support + on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha. diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 853a08d886..ab28ef5095 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg) uint8_t buf1[64]; uint8_t buf2[64]; - uint64_t N, r, p; + uint64_t N; + uint32_t r, p; uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL. int libscrypt_retval, openssl_retval; |