nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-14 09:11:14 -04:00
commit f5d2f79aca
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug22916_027 Normal file
View File

@ -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.

3
src/test/test_crypto_slow.c
View File

@ -137,7 +137,8 @@ test_libscrypt_eq_openssl(void *arg)
uint8_t buf1[64]; uint8_t buf1[64];
uint8_t buf2[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. uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
int libscrypt_retval, openssl_retval; int libscrypt_retval, openssl_retval;