summaryrefslogtreecommitdiff
path: root/src/common
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
commit1fce9d129604ea25db4a697218e961c0dadf0133 (patch)
treeba10fd91e3a241a219001581114997376518b19f /src/common
parent6b2ff4fff8d33acd44cacf8e4907a6382c40e216 (diff)
parent93b6d4137491cffc906e34dcd3cd4d284ad89e2f (diff)
downloadtor-1fce9d129604ea25db4a697218e961c0dadf0133.tar.gz
tor-1fce9d129604ea25db4a697218e961c0dadf0133.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/common')
-rw-r--r--src/common/tortls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 653bd66de5..fd2b213b62 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1295,7 +1295,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;
}