diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-25 20:04:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-25 20:22:46 -0500 |
| commit | 25afecdbf999eb91ed9216be1f8b8cdf0f78135b (patch) | |
| tree | 73665d46e5858deac1c95c2473166c8c67e98dc7 /src/or/config.c | |
| parent | c8b3bdb78215d4d7821d9bfa15bb8f7786403ce9 (diff) | |
| download | tor-25afecdbf999eb91ed9216be1f8b8cdf0f78135b.tar.gz tor-25afecdbf999eb91ed9216be1f8b8cdf0f78135b.zip | |
Make ECDHE group configurable: 224 for public, 256 for bridges (default)
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 1df10e110e..b81edf749c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -372,6 +372,7 @@ static config_var_t option_vars_[] = { OBSOLETE("TestVia"), V(TokenBucketRefillInterval, MSEC_INTERVAL, "100 msec"), V(Tor2webMode, BOOL, "0"), + V(TLSECGroup, STRING, NULL), V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), OBSOLETE("TrafficShaping"), @@ -1193,6 +1194,9 @@ options_transition_requires_fresh_tls_context(const or_options_t *old_options, return 1; } + if (!opt_streq(old_options->TLSECGroup, new_options->TLSECGroup)) + return 1; + return 0; } @@ -2301,6 +2305,12 @@ options_validate(or_options_t *old_options, or_options_t *options, } } + if (options->TLSECGroup && (strcasecmp(options->TLSECGroup, "P256") && + strcasecmp(options->TLSECGroup, "P224"))) { + COMPLAIN("Unrecognized TLSECGroup: Falling back to the default."); + tor_free(options->TLSECGroup); + } + if (options->ExcludeNodes && options->StrictNodes) { COMPLAIN("You have asked to exclude certain relays from all positions " "in your circuits. Expect hidden services and other Tor " |