diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-11 18:05:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-11 18:05:45 -0500 |
| commit | 93b6d4137491cffc906e34dcd3cd4d284ad89e2f (patch) | |
| tree | 0ff90209f4aa4f10dbd229ce6ea5d14eca831ac4 | |
| parent | d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f (diff) | |
| parent | 46796623f995c5b63d5cfbda1a038d9f6158ec90 (diff) | |
| download | tor-93b6d4137491cffc906e34dcd3cd4d284ad89e2f.tar.gz tor-93b6d4137491cffc906e34dcd3cd4d284ad89e2f.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.3
| -rw-r--r-- | src/common/tortls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 4ceb38ac86..ceb6147232 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1274,7 +1274,7 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, list = "P-256:P-224"; else list = "P-256:P-224"; - int r = SSL_CTX_set1_groups_list(result->ctx, list); + int r = (int) SSL_CTX_set1_groups_list(result->ctx, list); if (r < 0) goto error; } |