diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:03:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:03:01 -0400 |
| commit | 61029d69269d58e530028ee69b148581d3d8bd93 (patch) | |
| tree | 717d5e656824d14e9ad994e586a99fca6e65a180 /src | |
| parent | a19e3e26f467ecbf31f2c4174d699cd1989caf7a (diff) | |
| parent | 1b312f7b55bc5322f3029ad12715d9f348d44650 (diff) | |
| download | tor-61029d69269d58e530028ee69b148581d3d8bd93.tar.gz tor-61029d69269d58e530028ee69b148581d3d8bd93.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 77ade866ea..5aee664b84 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1344,10 +1344,8 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, nid = NID_secp224r1; else if (flags & TOR_TLS_CTX_USE_ECDHE_P256) nid = NID_X9_62_prime256v1; - else if (flags & TOR_TLS_CTX_IS_PUBLIC_SERVER) - nid = NID_X9_62_prime256v1; else - nid = NID_secp224r1; + nid = NID_X9_62_prime256v1; /* Use P-256 for ECDHE. */ ec_key = EC_KEY_new_by_curve_name(nid); if (ec_key != NULL) /*XXXX Handle errors? */ |