From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 19:15:19 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.21-alpha~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7790d48af73760a2ae10fcff70b319914316b90;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
---

a7790d48af73760a2ae10fcff70b319914316b90
diff --cc src/common/crypto.c
index 1d12a9d32d,29137a834d..e847d8c033
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -1877,12 -1699,13 +1879,13 @@@ crypto_dh_compute_secret(int severity, 
    if (!(pubkey_bn = BN_bin2bn((const unsigned char*)pubkey,
                                (int)pubkey_len, NULL)))
      goto error;
 -  if (tor_check_dh_key(pubkey_bn)<0) {
 +  if (tor_check_dh_key(severity, pubkey_bn)<0) {
      /* Check for invalid public keys. */
 -    log_warn(LD_CRYPTO,"Rejected invalid g^x");
 +    log_fn(severity, LD_CRYPTO,"Rejected invalid g^x");
      goto error;
    }
-   secret_tmp = tor_malloc(crypto_dh_get_bytes(dh));
+   secret_tmp_len = crypto_dh_get_bytes(dh);
+   secret_tmp = tor_malloc(secret_tmp_len);
    result = DH_compute_key((unsigned char*)secret_tmp, pubkey_bn, dh->dh);
    if (result < 0) {
      log_warn(LD_CRYPTO,"DH_compute_key() failed.");