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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 4575a141cf..cfd50e66be 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.233 2022/06/29 21:18:04 tb Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.234 2022/07/02 16:00:12 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2494,13 +2494,13 @@ ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
         STACK_OF(SSL_CIPHER) *prio, *allow;
         SSL_CIPHER *c, *ret = NULL;
         int can_use_ecc;
-        int i, ii, ok;
+        int i, ii, nid, ok;
         SSL_CERT *cert;
 
         /* Let's see which ciphers we can support */
         cert = s->cert;
 
-        can_use_ecc = (tls1_get_shared_curve(s) != NID_undef);
+        can_use_ecc = tls1_get_supported_group(s, &nid);
 
         /*
          * Do not set the compare functions, because this may lead to a