summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2025-01-18 13:03:02 +0000
committertb <>2025-01-18 13:03:02 +0000
commit93077848f9412d72805b8b71490e11c81467b18c (patch)
tree461714676015ee1a8e0bda29b12ac2cdb083a051 /src
parent2e44a02dc643d1822d558432dbf3d767fd5f05b4 (diff)
downloadopenbsd-93077848f9412d72805b8b71490e11c81467b18c.tar.gz
openbsd-93077848f9412d72805b8b71490e11c81467b18c.tar.bz2
openbsd-93077848f9412d72805b8b71490e11c81467b18c.zip
Stop pretending we support arbirary explicit groups
ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/t1_lib.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 9680c8d213..6b0dd3b737 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.198 2023/11/18 10:51:09 tb Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.199 2025/01/18 13:03:02 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 *
@@ -645,9 +645,8 @@ tls1_set_ec_id(uint16_t *group_id, uint8_t *comp_id, EC_KEY *ec)
645 645
646 /* Determine group ID. */ 646 /* Determine group ID. */
647 nid = EC_GROUP_get_curve_name(grp); 647 nid = EC_GROUP_get_curve_name(grp);
648 /* If we have an ID set it, otherwise set arbitrary explicit group. */
649 if (!tls1_ec_nid2group_id(nid, group_id)) 648 if (!tls1_ec_nid2group_id(nid, group_id))
650 *group_id = prime_field ? 0xff01 : 0xff02; 649 return (0);
651 650
652 if (comp_id == NULL) 651 if (comp_id == NULL)
653 return (1); 652 return (1);