Define a DH2048_KEY_LEN.

diff --git a/src/lib/crypt_ops/crypto_dh_nss.c b/src/lib/crypt_ops/crypto_dh_nss.c
index a0378077d6c09775db1b781f7c25fbef2582a37f..99d49e96e428e627861443fd380557b83ea8e444 100644 (file)
--- a/src/lib/crypt_ops/crypto_dh_nss.c
+++ b/src/lib/crypt_ops/crypto_dh_nss.c
@@ -25,7 +25,7 @@ ENABLE_GCC_WARNING("-Wstrict-prototypes")
 
 static int dh_initialized = 0;
 static SECKEYDHParams tls_dh_param, circuit_dh_param;
-static unsigned char tls_dh_prime_data[DH1024_KEY_LEN * 2];
+static unsigned char tls_dh_prime_data[DH2048_KEY_LEN];
 static unsigned char circuit_dh_prime_data[DH1024_KEY_LEN];
 static unsigned char dh_generator_data[1];
 
@@ -39,7 +39,7 @@ crypto_dh_init_nss(void)
   r = base16_decode((char*)tls_dh_prime_data,
                     sizeof(tls_dh_prime_data),
                     TLS_DH_PRIME, strlen(TLS_DH_PRIME));
-  tor_assert(r == DH1024_KEY_LEN * 2);
+  tor_assert(r == DH2048_KEY_LEN);
   r = base16_decode((char*)circuit_dh_prime_data,
                     sizeof(circuit_dh_prime_data),
                     OAKLEY_PRIME_2, strlen(OAKLEY_PRIME_2));
@@ -47,7 +47,7 @@ crypto_dh_init_nss(void)
   dh_generator_data[0] = DH_GENERATOR;
 
   tls_dh_param.prime.data = tls_dh_prime_data;
-  tls_dh_param.prime.len = DH1024_KEY_LEN * 2;
+  tls_dh_param.prime.len = DH2048_KEY_LEN;
   tls_dh_param.base.data = dh_generator_data;
   tls_dh_param.base.len = 1;
 

diff --git a/src/lib/defs/dh_sizes.h b/src/lib/defs/dh_sizes.h
index 4fc85cf3bdf88b96078b6d5f68143064e3f99937..46b3f5ea3af15a8dd9906ab5aad6ffd3755bd9fa 100644 (file)
--- a/src/lib/defs/dh_sizes.h
+++ b/src/lib/defs/dh_sizes.h
@@ -16,7 +16,10 @@
 #ifndef TOR_DH_SIZES_H
 #define TOR_DH_SIZES_H
 
-/** Length of our legacy DH keys. */
+/** Length of our legacy DH keys, in bytes. */
 #define DH1024_KEY_LEN (1024/8)
 
+/** Length of our current TLS DH keys, in bytes. */
+#define DH2048_KEY_LEN (2048/8)
+
 #endif /* !defined(TOR_DH_SIZES_H) */

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 20556be25d5c3dabb1b1c5ed75dc0a103a0bd2a4..a421f6533e22f7a63a042d5f9d07a47ca26a724a 100644 (file)
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -43,10 +43,10 @@ test_crypto_dh(void *arg)
   crypto_dh_t *dh1 = crypto_dh_new(DH_TYPE_CIRCUIT);
   crypto_dh_t *dh1_dup = NULL;
   crypto_dh_t *dh2 = crypto_dh_new(DH_TYPE_CIRCUIT);
-  char p1[DH1024_KEY_LEN * 2];
-  char p2[DH1024_KEY_LEN * 2];
-  char s1[DH1024_KEY_LEN * 2];
-  char s2[DH1024_KEY_LEN * 2];
+  char p1[DH2048_KEY_LEN];
+  char p2[DH2048_KEY_LEN];
+  char s1[DH2048_KEY_LEN];
+  char s2[DH2048_KEY_LEN];
   ssize_t s1len, s2len;
 #ifdef ENABLE_OPENSSL
   crypto_dh_t *dh3 = NULL;