Commit 3a7d7571 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'bug22916_027' into maint-0.2.9

parents ed0fb218 3cec1783

changes/bug22916_027

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test_crypto_slow.c

+2 −1
Original line number Diff line number Diff line
@@ -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;