aboutsummaryrefslogtreecommitdiff
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
commitc079be8c7d73110577ef5d16cc7e40d9789627ef (patch)
treed2805b733ab29c08ebb6c2108f27220182193fa1
parentc15a556a98f368794041b2efe89808908b818f6b (diff)
parent93b6d4137491cffc906e34dcd3cd4d284ad89e2f (diff)
downloadtor-c079be8c7d73110577ef5d16cc7e40d9789627ef.tar.gz
tor-c079be8c7d73110577ef5d16cc7e40d9789627ef.zip
Merge branch 'maint-0.3.3' into release-0.3.3
-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 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;
}