diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-14 09:11:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-14 09:11:14 -0400 |
| commit | 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5 (patch) | |
| tree | 404fe1fb5520b43ec93a0e25369f448c6c39b04b | |
| parent | bbc75faed1f7b73104ee706fc469249ad8f3d15c (diff) | |
| parent | f5d2f79acafc0cb7698442aec3323b2abe802e37 (diff) | |
| download | tor-52c1754ff6b7f181ab40d1f3148ed6a28d60cef5.tar.gz tor-52c1754ff6b7f181ab40d1f3148ed6a28d60cef5.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -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 6d676ff9b9..75c6ba9aaa 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -137,7 +137,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; |