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 | 896d0ebb994cc0b1df2c9497fcf3afe55654d01f (patch) | |
| tree | bc70565b95374ea80ec73128f9b821c2f362a968 /src | |
| parent | 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45 (diff) | |
| parent | 1fce9d129604ea25db4a697218e961c0dadf0133 (diff) | |
| download | tor-896d0ebb994cc0b1df2c9497fcf3afe55654d01f.tar.gz tor-896d0ebb994cc0b1df2c9497fcf3afe55654d01f.zip | |
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 235620714a..63f6259a6c 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -650,7 +650,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; } |