diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-09 10:49:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-09 10:49:47 -0500 |
| commit | 591a189fa42c87d706b4395ac6e70110f88b4fe9 (patch) | |
| tree | cd055d9e6028f1ffbc958331b94173b1331f231e /src | |
| parent | 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 (diff) | |
| parent | c06b7f090cfe49cef1b174d69277534eb0441696 (diff) | |
| download | tor-591a189fa42c87d706b4395ac6e70110f88b4fe9.tar.gz tor-591a189fa42c87d706b4395ac6e70110f88b4fe9.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tortls.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 08aa35a480..653bd66de5 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1284,6 +1284,22 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, SSL_CTX_set_tmp_dh(result->ctx, crypto_dh_get_dh_(dh)); crypto_dh_free(dh); } +/* We check for this function in two ways, since it might be either a symbol + * or a macro. */ +#if defined(SSL_CTX_set1_groups_list) || defined(HAVE_SSL_CTX_SET1_GROUPS_LIST) + { + const char *list; + if (flags & TOR_TLS_CTX_USE_ECDHE_P224) + list = "P-224:P-256"; + else if (flags & TOR_TLS_CTX_USE_ECDHE_P256) + list = "P-256:P-224"; + else + list = "P-256:P-224"; + int r = SSL_CTX_set1_groups_list(result->ctx, list); + if (r < 0) + goto error; + } +#else if (! is_client) { int nid; EC_KEY *ec_key; @@ -1299,6 +1315,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, SSL_CTX_set_tmp_ecdh(result->ctx, ec_key); EC_KEY_free(ec_key); } +#endif SSL_CTX_set_verify(result->ctx, SSL_VERIFY_PEER, always_accept_verify_cb); /* let us realloc bufs that we're writing from */ |