summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authortb <>2022-07-02 16:00:12 +0000
committertb <>2022-07-02 16:00:12 +0000
commitf7fed9455632a5807e76bd3a28879f5a87857c53 (patch)
tree9d374c62eeff973ee0b7721a87b5f66c56832f1e /src/lib/libssl/ssl_srvr.c
parentc757fe9bb6c16f47a415034b69dda698116160ba (diff)
downloadopenbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.tar.gz
openbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.tar.bz2
openbsd-f7fed9455632a5807e76bd3a28879f5a87857c53.zip
Rename uses 'curve' to 'group' and rework tls1 group API.
This reworks various tls1_ curve APIs to indicate success via a boolean return value and move the output to an out parameter. This makes the caller code easier and more consistent. Based on a suggestion by jsing ok jsing
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 8f110831e4..526d9e678b 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.146 2022/06/30 11:17:50 tb Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.147 2022/07/02 16:00:12 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 *
@@ -1380,7 +1380,7 @@ ssl3_send_server_kex_ecdhe(SSL *s, CBB *cbb)
1380 CBB public; 1380 CBB public;
1381 int nid; 1381 int nid;
1382 1382
1383 if ((nid = tls1_get_shared_curve(s)) == NID_undef) { 1383 if (!tls1_get_supported_group(s, &nid)) {
1384 SSLerror(s, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE); 1384 SSLerror(s, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
1385 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE); 1385 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
1386 goto err; 1386 goto err;