commit 764e0080929fe2e0fc05a226d340a189d264876b Merge: ecab261 c433736 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 25 12:03:41 2014 -0400 Merge branch 'libscrypt_trunnel_squashed' Conflicts: src/test/test_crypto.c .gitignore | 4 + Makefile.am | 1 - configure.ac | 11 + src/common/crypto.c | 44 ---- src/common/crypto.h | 6 - src/common/crypto_pwbox.c | 187 +++++++++++++++ src/common/crypto_pwbox.h | 20 ++ src/common/crypto_s2k.c | 457 ++++++++++++++++++++++++++++++++++++ src/common/crypto_s2k.h | 73 ++++++ src/common/include.am | 8 +- src/ext/trunnel/trunnel-impl.h | 306 ++++++++++++++++++++++++ src/ext/trunnel/trunnel.c | 242 +++++++++++++++++++ src/ext/trunnel/trunnel.h | 60 +++++ src/include.am | 2 + src/or/control.c | 17 +- src/or/main.c | 9 +- src/test/include.am | 2 +- src/test/test_crypto.c | 363 +++++++++++++++++++++++++++- src/trunnel/include.am | 29 +++ src/trunnel/pwbox.c | 509 ++++++++++++++++++++++++++++++++++++++++ src/trunnel/pwbox.h | 171 ++++++++++++++ src/trunnel/pwbox.trunnel | 14 ++ src/trunnel/trunnel-local.h | 18 ++ 23 files changed, 2486 insertions(+), 67 deletions(-) diff --cc src/test/test_crypto.c index 86b77a6,74b7a8e..36af725 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@@ -710,7 -699,7 +713,7 @@@ test_crypto_formats(void *arg /** Run unit tests for our secret-to-key passphrase hashing functionality. */ static void - test_crypto_s2k(void *arg) -test_crypto_s2k_rfc2440(void) ++test_crypto_s2k_rfc2440(void *arg) { char buf[29]; char buf2[29]; @@@ -723,9 -711,9 +726,9 @@@ buf3 = tor_malloc(65536); memset(buf3, 0, 65536); - secret_to_key(buf+9, 20, "", 0, buf); + secret_to_key_rfc2440(buf+9, 20, "", 0, buf); crypto_digest(buf2+9, buf3, 1024); - test_memeq(buf, buf2, 29); + tt_mem_op(buf,==, buf2, 29); memcpy(buf,"vrbacrda",8); memcpy(buf2,"vrbacrda",8);