summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-06 08:58:03 -0400
committerNick Mathewson <nickm@torproject.org>2015-10-06 08:58:03 -0400
commitf7ce93d97949fe0897bf8f1b2e95da73c620ff8a (patch)
tree9096fcf9f04f9f7390e7f94d42d802c3472c7deb
parentd4212d581ae418dcb91eac6343359bb7deb90c0a (diff)
downloadtor-f7ce93d97949fe0897bf8f1b2e95da73c620ff8a.tar.gz
tor-f7ce93d97949fe0897bf8f1b2e95da73c620ff8a.zip
Fix 17251: avoid integer overflow in test_crypto_slow
-rw-r--r--changes/bug172513
-rw-r--r--src/test/test_crypto_slow.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug17251 b/changes/bug17251
new file mode 100644
index 0000000000..edd7739d2f
--- /dev/null
+++ b/changes/bug17251
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Fix an integer overflow warning in test_crypto_slow.c.
+ Fixes bug 17251; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index d0f50f83b9..853a08d886 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -217,7 +217,7 @@ test_libscrypt_eq_openssl(void *arg)
memset(buf2,0,64);
N = 1048576;
- maxmem = 2 * 1024 * 1024 * 1024; // 2 GB
+ maxmem = 2 * 1024 * 1024 * (uint64_t)1024; // 2 GB
libscrypt_retval =
libscrypt_scrypt((const uint8_t *)"pleaseletmein",