Browse Source

Merge branch 'maint-0.3.0' into maint-0.3.1

Nick Mathewson 6 years ago
parent
commit
52c1754ff6
2 changed files with 5 additions and 1 deletions
  1. 3 0
      changes/bug22916_027
  2. 2 1
      src/test/test_crypto_slow.c

+ 3 - 0
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.

+ 2 - 1
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;