diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:02:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:02:28 -0400 |
| commit | 1b312f7b55bc5322f3029ad12715d9f348d44650 (patch) | |
| tree | 9b99d209095d88a1338774ea1a212add2df9b927 /src/common/tortls.c | |
| parent | 0e8ee795d901c1a5ac84e53bbea417fddace46bf (diff) | |
| parent | 72c1e5acfe1c6f04f4d7d398fc4a964d4bc5b62e (diff) | |
| download | tor-1b312f7b55bc5322f3029ad12715d9f348d44650.tar.gz tor-1b312f7b55bc5322f3029ad12715d9f348d44650.zip | |
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
Diffstat (limited to 'src/common/tortls.c')
| -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 90ebb755f9..60444f1b89 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1372,10 +1372,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? */ |