summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2020-09-12 17:27:11 +0000
committertb <>2020-09-12 17:27:11 +0000
commitb3e8f4a7980701599a2efe619be2eb35273abe96 (patch)
treead8a102152f3236a6f08dfff5fc1662c22ece28b /src
parent03c71a8ebd470d39849c9370adaf344cbcae3fdf (diff)
downloadopenbsd-b3e8f4a7980701599a2efe619be2eb35273abe96.tar.gz
openbsd-b3e8f4a7980701599a2efe619be2eb35273abe96.tar.bz2
openbsd-b3e8f4a7980701599a2efe619be2eb35273abe96.zip
Use the correct type for tls1_set_ec_id()
The curve_id is a uint16, not an int. ok beck jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_srvr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index cbf7c180b5..eaaa57efb3 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.82 2020/09/11 17:36:27 jsing Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.83 2020/09/12 17:27:11 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1352,7 +1352,7 @@ ssl3_send_server_kex_dhe(SSL *s, CBB *cbb)
1352static int 1352static int
1353ssl3_send_server_kex_ecdhe_ecp(SSL *s, int nid, CBB *cbb) 1353ssl3_send_server_kex_ecdhe_ecp(SSL *s, int nid, CBB *cbb)
1354{ 1354{
1355 int curve_id = 0; 1355 uint16_t curve_id;
1356 EC_KEY *ecdh; 1356 EC_KEY *ecdh;
1357 CBB ecpoint; 1357 CBB ecpoint;
1358 int al; 1358 int al;
@@ -1414,7 +1414,7 @@ static int
1414ssl3_send_server_kex_ecdhe_ecx(SSL *s, int nid, CBB *cbb) 1414ssl3_send_server_kex_ecdhe_ecx(SSL *s, int nid, CBB *cbb)
1415{ 1415{
1416 uint8_t *public_key = NULL, *private_key = NULL; 1416 uint8_t *public_key = NULL, *private_key = NULL;
1417 int curve_id; 1417 uint16_t curve_id;
1418 CBB ecpoint; 1418 CBB ecpoint;
1419 int ret = -1; 1419 int ret = -1;
1420 1420