From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Sep 2014 16:03:41 +0000 (-0400)
Subject: Merge branch 'libscrypt_trunnel_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=764e0080929fe2e0fc05a226d340a189d264876b;p=thirdparty%2Ftor.git

Merge branch 'libscrypt_trunnel_squashed'

Conflicts:
	src/test/test_crypto.c
---

764e0080929fe2e0fc05a226d340a189d264876b
diff --cc src/test/test_crypto.c
index 86b77a6622,74b7a8eb31..36af725e7b
--- 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);