aboutsummaryrefslogtreecommitdiff
path: root/src/lib/tls
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-11 18:05:45 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-11 18:05:45 -0500
commitd1e9285b1de1f6ec94494196c6e2daf4e5c615c0 (patch)
tree72e4b0d1ae221885862ac242fc963383ca500a0f /src/lib/tls
parente27dff08a344fdd31ac0ab6827deb5b501093bce (diff)
parent896d0ebb994cc0b1df2c9497fcf3afe55654d01f (diff)
downloadtor-d1e9285b1de1f6ec94494196c6e2daf4e5c615c0.tar.gz
tor-d1e9285b1de1f6ec94494196c6e2daf4e5c615c0.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/lib/tls')
-rw-r--r--src/lib/tls/tortls_openssl.c2
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;
}