July 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Merge branch 'bug22916_027' into maint-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3a7d757140c344986fba5769b47dc10d925fe119 Merge: ed0fb21 3cec178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:08 2017 -0400 Merge branch 'bug22916_027' into maint-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c7912909e3d79ed65684b6430eb524d4bbae54de Merge: d67c665 3a7d757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Merge branch 'bug22916_027' into maint-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3a7d757140c344986fba5769b47dc10d925fe119 Merge: ed0fb21 3cec178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:08 2017 -0400 Merge branch 'bug22916_027' into maint-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Fix compiler warnings with openssl-scrypt/libscrypt test on clang
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 17:49:48 2017 -0400 Fix compiler warnings with openssl-scrypt/libscrypt test on clang Clang didn't like that we were passing uint64_t values to an API that wanted uint32_t. GCC has either not cared, or has figured out that the values in question were safe to cast to uint32_t. Fixes bug22916; bugfix on 0.2.7.2-alpha. --- changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug22916_027 b/changes/bug22916_027 new file mode 100644 index 0000000..5cf99c7 --- /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 853a08d..ab28ef5 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -136,7 +136,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;

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5 Merge: bbc75fa f5d2f79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 4db33ecc04ef2ad8bb7ef04d8c67b3ae4a46d8bf Merge: 5eefa43 52c1754 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit f5d2f79acafc0cb7698442aec3323b2abe802e37 Merge: c1afbbe 3a7d757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'bug22916_027' into maint-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3a7d757140c344986fba5769b47dc10d925fe119 Merge: ed0fb21 3cec178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:08 2017 -0400 Merge branch 'bug22916_027' into maint-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Merge branch 'bug22916_027' into maint-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3a7d757140c344986fba5769b47dc10d925fe119 Merge: ed0fb21 3cec178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:08 2017 -0400 Merge branch 'bug22916_027' into maint-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit f5d2f79acafc0cb7698442aec3323b2abe802e37 Merge: c1afbbe 3a7d757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0