From 998dca5919395c28d8a45e44537bd6e801852eb2 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 24 Dec 2024 18:32:31 +0000
Subject: Remove already disabled tests for elliptic curves of small order

---
 src/regress/lib/libcrypto/ec/ec_asn1_test.c | 643 +---------------------------
 src/regress/lib/libcrypto/ecdh/ecc_cdh.c    | 230 +---------
 src/regress/lib/libcrypto/ecdh/ecdhtest.c   |  10 +-
 3 files changed, 3 insertions(+), 880 deletions(-)

diff --git a/src/regress/lib/libcrypto/ec/ec_asn1_test.c b/src/regress/lib/libcrypto/ec/ec_asn1_test.c
index b1eabdbfb1..558179277a 100644
--- a/src/regress/lib/libcrypto/ec/ec_asn1_test.c
+++ b/src/regress/lib/libcrypto/ec/ec_asn1_test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1_test.c,v 1.30 2024/11/24 10:13:16 tb Exp $ */
+/* $OpenBSD: ec_asn1_test.c,v 1.31 2024/12/24 18:32:31 tb Exp $ */
 /*
  * Copyright (c) 2017, 2021 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2024 Theo Buehler <tb@openbsd.org>
@@ -1035,245 +1035,6 @@ static const struct ec_private_key {
 	int oct_len;
 	uint8_t oct[256];
 } ec_private_keys[] = {
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.name = "secp112r1",
-		.der_len = 64,
-		.der = {
-			0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0x6a,
-			0xbb, 0xb5, 0x15, 0xda, 0xa6, 0xe9, 0x85, 0x64,
-			0xc4, 0x6c, 0x00, 0xef, 0x3f, 0xa0, 0x07, 0x06,
-			0x05, 0x2b, 0x81, 0x04, 0x00, 0x06, 0xa1, 0x20,
-			0x03, 0x1e, 0x00, 0x04, 0x0f, 0xa9, 0x6a, 0xcd,
-			0x14, 0x65, 0x87, 0xe4, 0x2c, 0x58, 0x86, 0x1b,
-			0x7a, 0x3d, 0x49, 0x3a, 0xaa, 0xeb, 0x97, 0xec,
-			0x19, 0xa3, 0x92, 0x3d, 0xe7, 0xe6, 0x6e, 0x47,
-		},
-		.hex =	"040FA96ACD146587"
-			"E42C58861B7A3D49"
-			"3AAAEB97EC19A392"
-			"3DE7E66E47",
-		.oct_len = 29,
-		.oct = {
-			0x04, 0x0f, 0xa9, 0x6a, 0xcd, 0x14, 0x65, 0x87,
-			0xe4, 0x2c, 0x58, 0x86, 0x1b, 0x7a, 0x3d, 0x49,
-			0x3a, 0xaa, 0xeb, 0x97, 0xec, 0x19, 0xa3, 0x92,
-			0x3d, 0xe7, 0xe6, 0x6e, 0x47,
-		},
-	},
-	{
-		.name = "secp112r2",
-		.der_len = 64,
-		.der = {
-			0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0x02,
-			0x97, 0xb2, 0xbb, 0x96, 0xa4, 0xdb, 0x26, 0xd6,
-			0x92, 0xb7, 0x75, 0x1c, 0x90, 0xa0, 0x07, 0x06,
-			0x05, 0x2b, 0x81, 0x04, 0x00, 0x07, 0xa1, 0x20,
-			0x03, 0x1e, 0x00, 0x04, 0x64, 0x2d, 0x25, 0x53,
-			0x3f, 0x43, 0xf2, 0x69, 0xb2, 0x55, 0x8d, 0x7c,
-			0xfd, 0x57, 0x7a, 0x8f, 0x38, 0x8b, 0x04, 0xd9,
-			0xae, 0x3b, 0xcf, 0x10, 0x30, 0x29, 0xdb, 0x59,
-		},
-		.hex =	"04642D25533F43F2"
-			"69B2558D7CFD577A"
-			"8F388B04D9AE3BCF"
-			"103029DB59",
-		.oct_len = 29,
-		.oct = {
-			0x04, 0x64, 0x2d, 0x25, 0x53, 0x3f, 0x43, 0xf2,
-			0x69, 0xb2, 0x55, 0x8d, 0x7c, 0xfd, 0x57, 0x7a,
-			0x8f, 0x38, 0x8b, 0x04, 0xd9, 0xae, 0x3b, 0xcf,
-			0x10, 0x30, 0x29, 0xdb, 0x59,
-		},
-	},
-	{
-		.name = "secp128r1",
-		.der_len = 70,
-		.der = {
-			0x30, 0x44, 0x02, 0x01, 0x01, 0x04, 0x10, 0x07,
-			0xd8, 0x7a, 0xf8, 0xda, 0xaf, 0x45, 0x03, 0xb5,
-			0x68, 0x63, 0xbd, 0xda, 0xcb, 0xd7, 0x70, 0xa0,
-			0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1c,
-			0xa1, 0x24, 0x03, 0x22, 0x00, 0x04, 0x3f, 0x88,
-			0x45, 0x10, 0x52, 0xc2, 0xf6, 0x56, 0x88, 0x1b,
-			0x6e, 0xee, 0x30, 0x21, 0x64, 0x98, 0x74, 0xde,
-			0x31, 0xaf, 0xd3, 0x85, 0x5e, 0x4d, 0xc0, 0xee,
-			0x06, 0x4c, 0x26, 0x6d, 0x5e, 0x6d,
-		},
-		.hex =	"043F88451052C2F6"
-			"56881B6EEE302164"
-			"9874DE31AFD3855E"
-			"4DC0EE064C266D5E"
-			"6D",
-		.oct_len = 33,
-		.oct = {
-			0x04, 0x3f, 0x88, 0x45, 0x10, 0x52, 0xc2, 0xf6,
-			0x56, 0x88, 0x1b, 0x6e, 0xee, 0x30, 0x21, 0x64,
-			0x98, 0x74, 0xde, 0x31, 0xaf, 0xd3, 0x85, 0x5e,
-			0x4d, 0xc0, 0xee, 0x06, 0x4c, 0x26, 0x6d, 0x5e,
-			0x6d,
-		},
-	},
-	{
-		.name = "secp128r2",
-		.der_len = 70,
-		.der = {
-			0x30, 0x44, 0x02, 0x01, 0x01, 0x04, 0x10, 0x16,
-			0x97, 0x3c, 0x79, 0xa0, 0x8f, 0x38, 0x41, 0x25,
-			0x64, 0xc6, 0x81, 0x5a, 0xce, 0xe4, 0x9f, 0xa0,
-			0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1d,
-			0xa1, 0x24, 0x03, 0x22, 0x00, 0x04, 0xd5, 0xf5,
-			0x1c, 0x2f, 0x02, 0xc0, 0x39, 0xeb, 0x6c, 0x7b,
-			0x20, 0x2b, 0xcf, 0x67, 0xe0, 0x8a, 0x2b, 0x83,
-			0x0d, 0x54, 0x61, 0xa0, 0xf3, 0x32, 0xdc, 0xe1,
-			0x19, 0xbb, 0x6e, 0xcf, 0x3c, 0xe2,
-		},
-		.hex =	"04D5F51C2F02C039"
-			"EB6C7B202BCF67E0"
-			"8A2B830D5461A0F3"
-			"32DCE119BB6ECF3C"
-			"E2",
-		.oct_len = 33,
-		.oct = {
-			0x04, 0xd5, 0xf5, 0x1c, 0x2f, 0x02, 0xc0, 0x39,
-			0xeb, 0x6c, 0x7b, 0x20, 0x2b, 0xcf, 0x67, 0xe0,
-			0x8a, 0x2b, 0x83, 0x0d, 0x54, 0x61, 0xa0, 0xf3,
-			0x32, 0xdc, 0xe1, 0x19, 0xbb, 0x6e, 0xcf, 0x3c,
-			0xe2,
-		},
-	},
-	{
-		.name = "secp160k1",
-		.der_len = 83,
-		.der = {
-			0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
-			0x3c, 0x42, 0x8b, 0x77, 0x87, 0x63, 0xab, 0x61,
-			0xff, 0x18, 0xf5, 0x96, 0xa6, 0x41, 0x48, 0xf6,
-			0xf5, 0x85, 0xa5, 0x00, 0xa0, 0x07, 0x06, 0x05,
-			0x2b, 0x81, 0x04, 0x00, 0x09, 0xa1, 0x2c, 0x03,
-			0x2a, 0x00, 0x04, 0xfe, 0x46, 0xef, 0xa6, 0xde,
-			0x95, 0x20, 0x34, 0x2e, 0x7c, 0x65, 0xe9, 0x31,
-			0xef, 0x5b, 0xd6, 0xb2, 0x80, 0x0a, 0x03, 0xba,
-			0xe8, 0xc6, 0x9c, 0x89, 0xff, 0x3d, 0x6b, 0xa5,
-			0x63, 0x8d, 0x7f, 0x17, 0x3e, 0x28, 0x49, 0xcc,
-			0xcd, 0x6e, 0xb0,
-		},
-		.hex =	"04FE46EFA6DE9520"
-			"342E7C65E931EF5B"
-			"D6B2800A03BAE8C6"
-			"9C89FF3D6BA5638D"
-			"7F173E2849CCCD6E"
-			"B0",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0xfe, 0x46, 0xef, 0xa6, 0xde, 0x95, 0x20,
-			0x34, 0x2e, 0x7c, 0x65, 0xe9, 0x31, 0xef, 0x5b,
-			0xd6, 0xb2, 0x80, 0x0a, 0x03, 0xba, 0xe8, 0xc6,
-			0x9c, 0x89, 0xff, 0x3d, 0x6b, 0xa5, 0x63, 0x8d,
-			0x7f, 0x17, 0x3e, 0x28, 0x49, 0xcc, 0xcd, 0x6e,
-			0xb0,
-		},
-	},
-	{
-		.name = "secp160r1",
-		.der_len = 83,
-		.der = {
-			0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
-			0xbf, 0x64, 0xb4, 0xc1, 0x9b, 0xd7, 0x76, 0x1e,
-			0xe8, 0x6f, 0xbf, 0x54, 0xa1, 0xfc, 0x7d, 0x4e,
-			0xfa, 0xf3, 0xcd, 0x2c, 0xa0, 0x07, 0x06, 0x05,
-			0x2b, 0x81, 0x04, 0x00, 0x08, 0xa1, 0x2c, 0x03,
-			0x2a, 0x00, 0x04, 0xda, 0xf0, 0xda, 0x8c, 0xad,
-			0x13, 0xe1, 0x12, 0x3b, 0x53, 0xef, 0x94, 0x98,
-			0xa3, 0x57, 0x85, 0xbb, 0x20, 0xc0, 0xd8, 0xb6,
-			0x61, 0xad, 0x44, 0x79, 0xd4, 0xbe, 0x3e, 0x6c,
-			0xcb, 0xae, 0x9e, 0xe0, 0xa2, 0x7e, 0x26, 0x6b,
-			0xfe, 0xc4, 0xa7,
-		},
-		.hex =	"04DAF0DA8CAD13E1"
-			"123B53EF9498A357"
-			"85BB20C0D8B661AD"
-			"4479D4BE3E6CCBAE"
-			"9EE0A27E266BFEC4"
-			"A7",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0xda, 0xf0, 0xda, 0x8c, 0xad, 0x13, 0xe1,
-			0x12, 0x3b, 0x53, 0xef, 0x94, 0x98, 0xa3, 0x57,
-			0x85, 0xbb, 0x20, 0xc0, 0xd8, 0xb6, 0x61, 0xad,
-			0x44, 0x79, 0xd4, 0xbe, 0x3e, 0x6c, 0xcb, 0xae,
-			0x9e, 0xe0, 0xa2, 0x7e, 0x26, 0x6b, 0xfe, 0xc4,
-			0xa7,
-		},
-	},
-	{
-		.name = "secp160r2",
-		.der_len = 83,
-		.der = {
-			0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
-			0x86, 0x4b, 0xae, 0x32, 0x2a, 0x3a, 0xed, 0xb3,
-			0xad, 0x02, 0x05, 0x6b, 0x0b, 0x9b, 0x3c, 0xae,
-			0x51, 0xd9, 0x46, 0x3e, 0xa0, 0x07, 0x06, 0x05,
-			0x2b, 0x81, 0x04, 0x00, 0x1e, 0xa1, 0x2c, 0x03,
-			0x2a, 0x00, 0x04, 0x36, 0xce, 0x2a, 0xbb, 0xec,
-			0x29, 0xdf, 0xda, 0x52, 0x21, 0x8b, 0x8b, 0x49,
-			0x37, 0xe3, 0xd6, 0x7f, 0xab, 0x66, 0x20, 0x81,
-			0xc7, 0x30, 0xeb, 0x00, 0xf0, 0xad, 0x66, 0x7c,
-			0x79, 0x19, 0xdc, 0xb1, 0x03, 0xdc, 0xcb, 0x73,
-			0x2b, 0x02, 0x63,
-		},
-		.hex =	"0436CE2ABBEC29DF"
-			"DA52218B8B4937E3"
-			"D67FAB662081C730"
-			"EB00F0AD667C7919"
-			"DCB103DCCB732B02"
-			"63",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0x36, 0xce, 0x2a, 0xbb, 0xec, 0x29, 0xdf,
-			0xda, 0x52, 0x21, 0x8b, 0x8b, 0x49, 0x37, 0xe3,
-			0xd6, 0x7f, 0xab, 0x66, 0x20, 0x81, 0xc7, 0x30,
-			0xeb, 0x00, 0xf0, 0xad, 0x66, 0x7c, 0x79, 0x19,
-			0xdc, 0xb1, 0x03, 0xdc, 0xcb, 0x73, 0x2b, 0x02,
-			0x63,
-		},
-	},
-	{
-		.name = "secp192k1",
-		.der_len = 94,
-		.der = {
-			0x30, 0x5c, 0x02, 0x01, 0x01, 0x04, 0x18, 0x6b,
-			0x81, 0x52, 0x97, 0xaf, 0xd3, 0x6b, 0xf3, 0xdb,
-			0xff, 0xaf, 0x73, 0x66, 0x83, 0x09, 0x84, 0x78,
-			0x87, 0xe1, 0xfb, 0x17, 0x35, 0x87, 0x3f, 0xa0,
-			0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1f,
-			0xa1, 0x34, 0x03, 0x32, 0x00, 0x04, 0xa8, 0x7c,
-			0x1e, 0x15, 0xf0, 0x1c, 0x8a, 0x8d, 0x7e, 0x14,
-			0xdb, 0x07, 0xd1, 0xac, 0xaf, 0x25, 0x77, 0xe5,
-			0x39, 0xbd, 0x59, 0x5a, 0xed, 0x64, 0x14, 0xef,
-			0xd3, 0xf2, 0x33, 0xab, 0x7b, 0xd5, 0x9e, 0x2a,
-			0x95, 0xed, 0x6f, 0x61, 0x83, 0xc3, 0x06, 0x27,
-			0x0c, 0x73, 0x6e, 0x73, 0x7c, 0xdc,
-		},
-		.hex =	"04A87C1E15F01C8A"
-			"8D7E14DB07D1ACAF"
-			"2577E539BD595AED"
-			"6414EFD3F233AB7B"
-			"D59E2A95ED6F6183"
-			"C306270C736E737C"
-			"DC",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0xa8, 0x7c, 0x1e, 0x15, 0xf0, 0x1c, 0x8a,
-			0x8d, 0x7e, 0x14, 0xdb, 0x07, 0xd1, 0xac, 0xaf,
-			0x25, 0x77, 0xe5, 0x39, 0xbd, 0x59, 0x5a, 0xed,
-			0x64, 0x14, 0xef, 0xd3, 0xf2, 0x33, 0xab, 0x7b,
-			0xd5, 0x9e, 0x2a, 0x95, 0xed, 0x6f, 0x61, 0x83,
-			0xc3, 0x06, 0x27, 0x0c, 0x73, 0x6e, 0x73, 0x7c,
-			0xdc,
-		},
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.name = "secp224k1",
 		.der_len = 107,
@@ -1521,116 +1282,6 @@ static const struct ec_private_key {
 			0x9c, 0x6b, 0xce, 0xc4, 0x8e,
 		},
 	},
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.name = "prime192v1",
-		.der_len = 97,
-		.der = {
-			0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x70,
-			0x28, 0x4b, 0x5c, 0x39, 0xf6, 0x28, 0xea, 0xe0,
-			0xf4, 0xbc, 0x95, 0x12, 0x05, 0x4e, 0xee, 0x61,
-			0x84, 0x3e, 0xbc, 0xe7, 0xae, 0x6c, 0x28, 0xa0,
-			0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-			0x03, 0x01, 0x01, 0xa1, 0x34, 0x03, 0x32, 0x00,
-			0x04, 0x6e, 0x8a, 0x84, 0x2c, 0x8a, 0x39, 0xee,
-			0x94, 0x6b, 0xb2, 0x8a, 0x17, 0x8e, 0x96, 0x5e,
-			0xa2, 0x0f, 0x2e, 0xb0, 0x73, 0x43, 0x56, 0x46,
-			0xf1, 0x02, 0xe8, 0xa6, 0x81, 0x41, 0x93, 0x74,
-			0xfe, 0xe6, 0x4c, 0xf6, 0xb9, 0x5a, 0x39, 0x18,
-			0x6a, 0xba, 0x4e, 0x52, 0xeb, 0x29, 0x81, 0x87,
-			0x92,
-		},
-		.hex =	"046E8A842C8A39EE"
-			"946BB28A178E965E"
-			"A20F2EB073435646"
-			"F102E8A681419374"
-			"FEE64CF6B95A3918"
-			"6ABA4E52EB298187"
-			"92",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0x6e, 0x8a, 0x84, 0x2c, 0x8a, 0x39, 0xee,
-			0x94, 0x6b, 0xb2, 0x8a, 0x17, 0x8e, 0x96, 0x5e,
-			0xa2, 0x0f, 0x2e, 0xb0, 0x73, 0x43, 0x56, 0x46,
-			0xf1, 0x02, 0xe8, 0xa6, 0x81, 0x41, 0x93, 0x74,
-			0xfe, 0xe6, 0x4c, 0xf6, 0xb9, 0x5a, 0x39, 0x18,
-			0x6a, 0xba, 0x4e, 0x52, 0xeb, 0x29, 0x81, 0x87,
-			0x92,
-		},
-	},
-	{
-		.name = "prime192v2",
-		.der_len = 97,
-		.der = {
-			0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x1a,
-			0x8a, 0x60, 0x51, 0xe0, 0xd6, 0x66, 0x15, 0x47,
-			0xba, 0xec, 0xec, 0x0c, 0xa6, 0x26, 0xd4, 0x6d,
-			0x60, 0x81, 0x22, 0xe6, 0xb2, 0x43, 0x5b, 0xa0,
-			0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-			0x03, 0x01, 0x02, 0xa1, 0x34, 0x03, 0x32, 0x00,
-			0x04, 0x62, 0x5d, 0xfb, 0x0e, 0x58, 0x95, 0xd1,
-			0xe7, 0x13, 0x66, 0x9a, 0x0c, 0x5c, 0xef, 0x2f,
-			0x2f, 0x33, 0xbb, 0x2b, 0xa0, 0x09, 0x6e, 0x04,
-			0x3e, 0x01, 0x3c, 0x60, 0x5e, 0xc3, 0xba, 0xfc,
-			0x1c, 0xb9, 0x4d, 0x0d, 0xb5, 0xa9, 0x9e, 0x56,
-			0x4b, 0xab, 0x5b, 0x66, 0xa7, 0x98, 0xa6, 0x9a,
-			0xe6,
-		},
-		.hex =	"04625DFB0E5895D1"
-			"E713669A0C5CEF2F"
-			"2F33BB2BA0096E04"
-			"3E013C605EC3BAFC"
-			"1CB94D0DB5A99E56"
-			"4BAB5B66A798A69A"
-			"E6",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0x62, 0x5d, 0xfb, 0x0e, 0x58, 0x95, 0xd1,
-			0xe7, 0x13, 0x66, 0x9a, 0x0c, 0x5c, 0xef, 0x2f,
-			0x2f, 0x33, 0xbb, 0x2b, 0xa0, 0x09, 0x6e, 0x04,
-			0x3e, 0x01, 0x3c, 0x60, 0x5e, 0xc3, 0xba, 0xfc,
-			0x1c, 0xb9, 0x4d, 0x0d, 0xb5, 0xa9, 0x9e, 0x56,
-			0x4b, 0xab, 0x5b, 0x66, 0xa7, 0x98, 0xa6, 0x9a,
-			0xe6,
-		},
-	},
-	{
-		.name = "prime192v3",
-		.der_len = 97,
-		.der = {
-			0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x9c,
-			0x56, 0xc9, 0xaf, 0xc1, 0x86, 0x00, 0x04, 0x9a,
-			0xb0, 0xb9, 0x11, 0x4c, 0x72, 0x07, 0xe7, 0xa5,
-			0x4c, 0x73, 0x66, 0x4c, 0x14, 0x70, 0x33, 0xa0,
-			0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-			0x03, 0x01, 0x03, 0xa1, 0x34, 0x03, 0x32, 0x00,
-			0x04, 0x51, 0x38, 0x9f, 0x96, 0x4e, 0x13, 0x0c,
-			0xe2, 0x93, 0xee, 0xc6, 0x44, 0x10, 0xfd, 0xff,
-			0xae, 0xd4, 0x08, 0x0f, 0x3a, 0x78, 0x71, 0xdc,
-			0xfe, 0x6d, 0x46, 0x0e, 0xe4, 0xe6, 0x99, 0xd1,
-			0x25, 0x8c, 0xb8, 0xc0, 0xe9, 0x7c, 0x7a, 0xd3,
-			0xc8, 0xd8, 0x3a, 0xc5, 0x7d, 0xfb, 0x9c, 0x78,
-			0xd3,
-		},
-		.hex =	"0451389F964E130C"
-			"E293EEC64410FDFF"
-			"AED4080F3A7871DC"
-			"FE6D460EE4E699D1"
-			"258CB8C0E97C7AD3"
-			"C8D83AC57DFB9C78"
-			"D3",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0x51, 0x38, 0x9f, 0x96, 0x4e, 0x13, 0x0c,
-			0xe2, 0x93, 0xee, 0xc6, 0x44, 0x10, 0xfd, 0xff,
-			0xae, 0xd4, 0x08, 0x0f, 0x3a, 0x78, 0x71, 0xdc,
-			0xfe, 0x6d, 0x46, 0x0e, 0xe4, 0xe6, 0x99, 0xd1,
-			0x25, 0x8c, 0xb8, 0xc0, 0xe9, 0x7c, 0x7a, 0xd3,
-			0xc8, 0xd8, 0x3a, 0xc5, 0x7d, 0xfb, 0x9c, 0x78,
-			0xd3,
-		},
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.name = "prime239v1",
 		.der_len = 115,
@@ -1794,298 +1445,6 @@ static const struct ec_private_key {
 			0xe3,
 		},
 	},
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.name = "wap-wsg-idm-ecid-wtls6",
-		.der_len = 64,
-		.der = {
-			0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0xb0,
-			0x78, 0x23, 0x28, 0xc9, 0xb6, 0x9a, 0x7f, 0xad,
-			0x36, 0xa8, 0x56, 0x6c, 0xc8, 0xa0, 0x07, 0x06,
-			0x05, 0x67, 0x2b, 0x01, 0x04, 0x06, 0xa1, 0x20,
-			0x03, 0x1e, 0x00, 0x04, 0x56, 0x3f, 0x72, 0xf1,
-			0xb5, 0xee, 0x7a, 0x4c, 0x59, 0x76, 0xd4, 0x97,
-			0x43, 0x15, 0x6e, 0x27, 0x8a, 0x4f, 0x28, 0x11,
-			0xb8, 0xf6, 0x80, 0xfe, 0x7a, 0xb1, 0xa2, 0x74,
-		},
-		.hex =	"04563F72F1B5EE7A"
-			"4C5976D49743156E"
-			"278A4F2811B8F680"
-			"FE7AB1A274",
-		.oct_len = 29,
-		.oct = {
-			0x04, 0x56, 0x3f, 0x72, 0xf1, 0xb5, 0xee, 0x7a,
-			0x4c, 0x59, 0x76, 0xd4, 0x97, 0x43, 0x15, 0x6e,
-			0x27, 0x8a, 0x4f, 0x28, 0x11, 0xb8, 0xf6, 0x80,
-			0xfe, 0x7a, 0xb1, 0xa2, 0x74,
-		},
-	},
-	{
-		.name = "wap-wsg-idm-ecid-wtls7",
-		.der_len = 83,
-		.der = {
-			0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
-			0x4a, 0x5e, 0xc3, 0x6c, 0x1d, 0xd5, 0xf3, 0x1b,
-			0x2e, 0xf1, 0x3a, 0xd3, 0xae, 0x05, 0xc1, 0x6a,
-			0x90, 0xa4, 0xc2, 0x85, 0xa0, 0x07, 0x06, 0x05,
-			0x67, 0x2b, 0x01, 0x04, 0x07, 0xa1, 0x2c, 0x03,
-			0x2a, 0x00, 0x04, 0xaf, 0x84, 0x2d, 0x08, 0xcb,
-			0xe2, 0xf2, 0xa3, 0xac, 0x20, 0xb0, 0x99, 0x5c,
-			0x38, 0xd7, 0x5e, 0xce, 0xb9, 0x0b, 0x2e, 0x38,
-			0xdd, 0xcf, 0x13, 0x7f, 0x5a, 0xfa, 0xac, 0x1d,
-			0x92, 0x2e, 0x9a, 0xa9, 0x73, 0x2b, 0xc3, 0x06,
-			0x0e, 0x4e, 0x69,
-		},
-		.hex =	"04AF842D08CBE2F2"
-			"A3AC20B0995C38D7"
-			"5ECEB90B2E38DDCF"
-			"137F5AFAAC1D922E"
-			"9AA9732BC3060E4E"
-			"69",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0xaf, 0x84, 0x2d, 0x08, 0xcb, 0xe2, 0xf2,
-			0xa3, 0xac, 0x20, 0xb0, 0x99, 0x5c, 0x38, 0xd7,
-			0x5e, 0xce, 0xb9, 0x0b, 0x2e, 0x38, 0xdd, 0xcf,
-			0x13, 0x7f, 0x5a, 0xfa, 0xac, 0x1d, 0x92, 0x2e,
-			0x9a, 0xa9, 0x73, 0x2b, 0xc3, 0x06, 0x0e, 0x4e,
-			0x69,
-		},
-	},
-	{
-		.name = "wap-wsg-idm-ecid-wtls8",
-		.der_len = 65,
-		.der = {
-			0x30, 0x3f, 0x02, 0x01, 0x01, 0x04, 0x0f, 0x00,
-			0x65, 0x6b, 0x08, 0x24, 0x76, 0xd2, 0xbe, 0xc6,
-			0xc2, 0x44, 0x9a, 0xc8, 0x86, 0xdb, 0xa0, 0x07,
-			0x06, 0x05, 0x67, 0x2b, 0x01, 0x04, 0x08, 0xa1,
-			0x20, 0x03, 0x1e, 0x00, 0x04, 0x48, 0x81, 0x4b,
-			0xae, 0x65, 0xf8, 0xda, 0x02, 0x2c, 0x66, 0xc6,
-			0x0b, 0x1d, 0xa6, 0x98, 0x42, 0x25, 0xf2, 0x31,
-			0x52, 0x3c, 0x6a, 0x6a, 0x2f, 0x69, 0x1a, 0x06,
-			0x56,
-		},
-		.hex =	"0448814BAE65F8DA"
-			"022C66C60B1DA698"
-			"4225F231523C6A6A"
-			"2F691A0656",
-		.oct_len = 29,
-		.oct = {
-			0x04, 0x48, 0x81, 0x4b, 0xae, 0x65, 0xf8, 0xda,
-			0x02, 0x2c, 0x66, 0xc6, 0x0b, 0x1d, 0xa6, 0x98,
-			0x42, 0x25, 0xf2, 0x31, 0x52, 0x3c, 0x6a, 0x6a,
-			0x2f, 0x69, 0x1a, 0x06, 0x56,
-		},
-	},
-	{
-		.name = "wap-wsg-idm-ecid-wtls9",
-		.der_len = 83,
-		.der = {
-			0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
-			0xf4, 0x0c, 0x58, 0x87, 0xc4, 0xb6, 0x20, 0xf5,
-			0x18, 0xc2, 0x46, 0x9b, 0x2d, 0xbf, 0x1d, 0x56,
-			0x26, 0x07, 0x7f, 0x85, 0xa0, 0x07, 0x06, 0x05,
-			0x67, 0x2b, 0x01, 0x04, 0x09, 0xa1, 0x2c, 0x03,
-			0x2a, 0x00, 0x04, 0xaa, 0xfc, 0xe4, 0xfe, 0xf8,
-			0x91, 0x48, 0xf1, 0xcc, 0x49, 0x44, 0x35, 0x3d,
-			0x49, 0x71, 0x44, 0xdc, 0x74, 0x73, 0x5b, 0x5f,
-			0x01, 0x4b, 0xab, 0x8b, 0x5c, 0x84, 0xec, 0x2b,
-			0xfa, 0x7e, 0xdc, 0x50, 0xc4, 0xac, 0xea, 0x84,
-			0x2f, 0xba, 0x3c,
-		},
-		.hex =	"04AAFCE4FEF89148"
-			"F1CC4944353D4971"
-			"44DC74735B5F014B"
-			"AB8B5C84EC2BFA7E"
-			"DC50C4ACEA842FBA"
-			"3C",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0xaa, 0xfc, 0xe4, 0xfe, 0xf8, 0x91, 0x48,
-			0xf1, 0xcc, 0x49, 0x44, 0x35, 0x3d, 0x49, 0x71,
-			0x44, 0xdc, 0x74, 0x73, 0x5b, 0x5f, 0x01, 0x4b,
-			0xab, 0x8b, 0x5c, 0x84, 0xec, 0x2b, 0xfa, 0x7e,
-			0xdc, 0x50, 0xc4, 0xac, 0xea, 0x84, 0x2f, 0xba,
-			0x3c,
-		},
-	},
-	{
-		.name = "wap-wsg-idm-ecid-wtls12",
-		.der_len = 106,
-		.der = {
-			0x30, 0x68, 0x02, 0x01, 0x01, 0x04, 0x1c, 0x19,
-			0x63, 0x30, 0xa6, 0x6b, 0xd3, 0xc6, 0x7a, 0x65,
-			0xec, 0x6f, 0xe9, 0x2a, 0x37, 0x12, 0xa1, 0x44,
-			0xe0, 0x42, 0x26, 0x4e, 0x11, 0xc4, 0xec, 0x2b,
-			0x0a, 0x8b, 0x96, 0xa0, 0x07, 0x06, 0x05, 0x67,
-			0x2b, 0x01, 0x04, 0x0c, 0xa1, 0x3c, 0x03, 0x3a,
-			0x00, 0x04, 0x47, 0xd6, 0x63, 0x27, 0xe1, 0xad,
-			0x30, 0xac, 0xba, 0xab, 0x86, 0xd6, 0x63, 0xb5,
-			0xd9, 0xc5, 0x9c, 0x24, 0x3a, 0xd9, 0x6a, 0x7a,
-			0x5d, 0x2b, 0x45, 0x71, 0x8d, 0x7e, 0xd2, 0x32,
-			0x75, 0x65, 0xc4, 0x37, 0x25, 0xc7, 0x1f, 0xeb,
-			0x33, 0xf7, 0x68, 0x29, 0x16, 0x82, 0x96, 0xd9,
-			0x00, 0xaf, 0xdc, 0x4a, 0xe7, 0xc6, 0x61, 0x44,
-			0x50, 0xc6,
-		},
-		.hex =	"0447D66327E1AD30"
-			"ACBAAB86D663B5D9"
-			"C59C243AD96A7A5D"
-			"2B45718D7ED23275"
-			"65C43725C71FEB33"
-			"F76829168296D900"
-			"AFDC4AE7C6614450"
-			"C6",
-		.oct_len = 57,
-		.oct = {
-			0x04, 0x47, 0xd6, 0x63, 0x27, 0xe1, 0xad, 0x30,
-			0xac, 0xba, 0xab, 0x86, 0xd6, 0x63, 0xb5, 0xd9,
-			0xc5, 0x9c, 0x24, 0x3a, 0xd9, 0x6a, 0x7a, 0x5d,
-			0x2b, 0x45, 0x71, 0x8d, 0x7e, 0xd2, 0x32, 0x75,
-			0x65, 0xc4, 0x37, 0x25, 0xc7, 0x1f, 0xeb, 0x33,
-			0xf7, 0x68, 0x29, 0x16, 0x82, 0x96, 0xd9, 0x00,
-			0xaf, 0xdc, 0x4a, 0xe7, 0xc6, 0x61, 0x44, 0x50,
-			0xc6,
-		},
-	},
-	{
-		.name = "brainpoolP160r1",
-		.der_len = 86,
-		.der = {
-			0x30, 0x54, 0x02, 0x01, 0x01, 0x04, 0x14, 0x97,
-			0x68, 0xac, 0xb7, 0x50, 0x24, 0x24, 0x39, 0x41,
-			0x6e, 0x90, 0x27, 0xea, 0x6f, 0xaa, 0x11, 0x29,
-			0xa2, 0x4e, 0xae, 0xa0, 0x0b, 0x06, 0x09, 0x2b,
-			0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x01,
-			0xa1, 0x2c, 0x03, 0x2a, 0x00, 0x04, 0x4c, 0x15,
-			0x49, 0x81, 0x94, 0xf5, 0x6e, 0x80, 0x8e, 0xc8,
-			0x65, 0xea, 0x48, 0xfa, 0x29, 0xc2, 0x59, 0xf1,
-			0x36, 0xd6, 0x8d, 0xa4, 0xc5, 0xe0, 0x7d, 0xe5,
-			0xa2, 0xcc, 0xc4, 0xd0, 0x1d, 0xd6, 0xe6, 0xcf,
-			0x11, 0x6e, 0x59, 0x12, 0xbb, 0x14,
-		},
-		.hex =	"044C15498194F56E"
-			"808EC865EA48FA29"
-			"C259F136D68DA4C5"
-			"E07DE5A2CCC4D01D"
-			"D6E6CF116E5912BB"
-			"14",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0x4c, 0x15, 0x49, 0x81, 0x94, 0xf5, 0x6e,
-			0x80, 0x8e, 0xc8, 0x65, 0xea, 0x48, 0xfa, 0x29,
-			0xc2, 0x59, 0xf1, 0x36, 0xd6, 0x8d, 0xa4, 0xc5,
-			0xe0, 0x7d, 0xe5, 0xa2, 0xcc, 0xc4, 0xd0, 0x1d,
-			0xd6, 0xe6, 0xcf, 0x11, 0x6e, 0x59, 0x12, 0xbb,
-			0x14,
-		},
-	},
-	{
-		.name = "brainpoolP160t1",
-		.der_len = 86,
-		.der = {
-			0x30, 0x54, 0x02, 0x01, 0x01, 0x04, 0x14, 0x2a,
-			0xa6, 0xfa, 0x75, 0x2b, 0xb4, 0xc9, 0x99, 0xbb,
-			0x61, 0xeb, 0x15, 0xdc, 0xf3, 0xd1, 0x42, 0x63,
-			0x30, 0x5d, 0x73, 0xa0, 0x0b, 0x06, 0x09, 0x2b,
-			0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x02,
-			0xa1, 0x2c, 0x03, 0x2a, 0x00, 0x04, 0x96, 0x4b,
-			0x2c, 0x8a, 0xed, 0x9b, 0x18, 0x30, 0xc1, 0x1c,
-			0xbc, 0x16, 0x56, 0x7b, 0xc0, 0x3a, 0x6c, 0x52,
-			0xf8, 0x71, 0xdf, 0x54, 0x20, 0x96, 0xe3, 0xe9,
-			0xcf, 0x8f, 0x31, 0xb1, 0x69, 0x99, 0xc6, 0x11,
-			0x80, 0x0d, 0x40, 0x25, 0xf0, 0x90,
-		},
-		.hex =	"04964B2C8AED9B18"
-			"30C11CBC16567BC0"
-			"3A6C52F871DF5420"
-			"96E3E9CF8F31B169"
-			"99C611800D4025F0"
-			"90",
-		.oct_len = 41,
-		.oct = {
-			0x04, 0x96, 0x4b, 0x2c, 0x8a, 0xed, 0x9b, 0x18,
-			0x30, 0xc1, 0x1c, 0xbc, 0x16, 0x56, 0x7b, 0xc0,
-			0x3a, 0x6c, 0x52, 0xf8, 0x71, 0xdf, 0x54, 0x20,
-			0x96, 0xe3, 0xe9, 0xcf, 0x8f, 0x31, 0xb1, 0x69,
-			0x99, 0xc6, 0x11, 0x80, 0x0d, 0x40, 0x25, 0xf0,
-			0x90,
-		},
-	},
-	{
-		.name = "brainpoolP192r1",
-		.der_len = 98,
-		.der = {
-			0x30, 0x60, 0x02, 0x01, 0x01, 0x04, 0x18, 0x7c,
-			0x05, 0x09, 0x95, 0xaf, 0x22, 0x1f, 0xc0, 0x0d,
-			0xfe, 0x6d, 0x44, 0xf2, 0x87, 0x0c, 0x7d, 0x0e,
-			0xed, 0x17, 0x46, 0xe1, 0x7d, 0xe3, 0x16, 0xa0,
-			0x0b, 0x06, 0x09, 0x2b, 0x24, 0x03, 0x03, 0x02,
-			0x08, 0x01, 0x01, 0x03, 0xa1, 0x34, 0x03, 0x32,
-			0x00, 0x04, 0x71, 0x60, 0x9c, 0x62, 0x98, 0x76,
-			0xc9, 0x14, 0x91, 0x75, 0xc6, 0xc8, 0x16, 0x32,
-			0xc2, 0x29, 0x47, 0x64, 0xa3, 0x59, 0xa7, 0x45,
-			0xdb, 0xd7, 0x51, 0x95, 0xba, 0xa4, 0x33, 0x46,
-			0x6e, 0x4f, 0x86, 0xed, 0x1e, 0xea, 0xf6, 0xf1,
-			0x3c, 0xf1, 0x96, 0x94, 0x1f, 0x9c, 0x04, 0x2a,
-			0x43, 0x27,
-		},
-		.hex =	"0471609C629876C9"
-			"149175C6C81632C2"
-			"294764A359A745DB"
-			"D75195BAA433466E"
-			"4F86ED1EEAF6F13C"
-			"F196941F9C042A43"
-			"27",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0x71, 0x60, 0x9c, 0x62, 0x98, 0x76, 0xc9,
-			0x14, 0x91, 0x75, 0xc6, 0xc8, 0x16, 0x32, 0xc2,
-			0x29, 0x47, 0x64, 0xa3, 0x59, 0xa7, 0x45, 0xdb,
-			0xd7, 0x51, 0x95, 0xba, 0xa4, 0x33, 0x46, 0x6e,
-			0x4f, 0x86, 0xed, 0x1e, 0xea, 0xf6, 0xf1, 0x3c,
-			0xf1, 0x96, 0x94, 0x1f, 0x9c, 0x04, 0x2a, 0x43,
-			0x27,
-		},
-	},
-	{
-		.name = "brainpoolP192t1",
-		.der_len = 98,
-		.der = {
-			0x30, 0x60, 0x02, 0x01, 0x01, 0x04, 0x18, 0xbb,
-			0x53, 0xd5, 0x6c, 0x01, 0x1f, 0x0f, 0x25, 0xfd,
-			0x1d, 0x92, 0xc5, 0x60, 0xb2, 0x64, 0xe0, 0x32,
-			0x0f, 0x69, 0x36, 0xcb, 0x16, 0x3e, 0x37, 0xa0,
-			0x0b, 0x06, 0x09, 0x2b, 0x24, 0x03, 0x03, 0x02,
-			0x08, 0x01, 0x01, 0x04, 0xa1, 0x34, 0x03, 0x32,
-			0x00, 0x04, 0x8d, 0x2b, 0x0c, 0xee, 0xea, 0x4b,
-			0x63, 0xaf, 0x63, 0x36, 0xb2, 0x3a, 0x55, 0x40,
-			0x85, 0x33, 0x95, 0xc1, 0x1d, 0x37, 0xd3, 0xfc,
-			0x5c, 0x25, 0x8a, 0x0a, 0xc5, 0xec, 0x7f, 0xe0,
-			0x7f, 0x08, 0x5e, 0xdf, 0x89, 0xe6, 0xee, 0x21,
-			0x6d, 0x1b, 0x15, 0xd7, 0x4b, 0x79, 0xc1, 0xb5,
-			0x28, 0xc7,
-		},
-		.hex =	"048D2B0CEEEA4B63"
-			"AF6336B23A554085"
-			"3395C11D37D3FC5C"
-			"258A0AC5EC7FE07F"
-			"085EDF89E6EE216D"
-			"1B15D74B79C1B528"
-			"C7",
-		.oct_len = 49,
-		.oct = {
-			0x04, 0x8d, 0x2b, 0x0c, 0xee, 0xea, 0x4b, 0x63,
-			0xaf, 0x63, 0x36, 0xb2, 0x3a, 0x55, 0x40, 0x85,
-			0x33, 0x95, 0xc1, 0x1d, 0x37, 0xd3, 0xfc, 0x5c,
-			0x25, 0x8a, 0x0a, 0xc5, 0xec, 0x7f, 0xe0, 0x7f,
-			0x08, 0x5e, 0xdf, 0x89, 0xe6, 0xee, 0x21, 0x6d,
-			0x1b, 0x15, 0xd7, 0x4b, 0x79, 0xc1, 0xb5, 0x28,
-			0xc7,
-		},
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.name = "brainpoolP224r1",
 		.der_len = 110,
diff --git a/src/regress/lib/libcrypto/ecdh/ecc_cdh.c b/src/regress/lib/libcrypto/ecdh/ecc_cdh.c
index 0ab031276d..39351cd7de 100644
--- a/src/regress/lib/libcrypto/ecdh/ecc_cdh.c
+++ b/src/regress/lib/libcrypto/ecdh/ecc_cdh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecc_cdh.c,v 1.3 2024/11/24 10:13:16 tb Exp $ */
+/*	$OpenBSD: ecc_cdh.c,v 1.4 2024/12/24 18:32:31 tb Exp $ */
 
 /*
  * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
@@ -40,234 +40,6 @@ static const struct ecc_cdh_test {
 	const char *pub_y;
 	const char *want;
 } ecc_cdh_tests[] = {
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0",
-		.peer_y = "dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523",
-		.priv = "f17d3fea367b74d340851ca4270dcb24c271f445bed9d527",
-		.pub_x = "b15053401f57285637ec324c1cd2139e3a67de3739234b37",
-		.pub_y = "f269c158637482aad644cd692dd1d3ef2c8a7c49e389f7f6",
-		.want = "803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "deb5712fa027ac8d2f22c455ccb73a91e17b6512b5e030e7",
-		.peer_y = "7e2690a02cc9b28708431a29fb54b87b1f0c14e011ac2125",
-		.priv = "56e853349d96fe4c442448dacb7cf92bb7a95dcf574a9bd5",
-		.pub_x = "c00d435716ffea53fd8c162792414c37665187e582716539",
-		.pub_y = "ab711c62aa71a5a18e8a3c48f89dc6fa52fac0108e52a8a0",
-		.want = "c208847568b98835d7312cef1f97f7aa298283152313c29d",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "4edaa8efc5a0f40f843663ec5815e7762dddc008e663c20f",
-		.peer_y = "0a9f8dc67a3e60ef6d64b522185d03df1fc0adfd42478279",
-		.priv = "c6ef61fe12e80bf56f2d3f7d0bb757394519906d55500949",
-		.pub_x = "e184bc182482f3403c8787b83842477467fcd011db0f6c64",
-		.pub_y = "f9d1c14142f40de8639db97d51a63d2cce1007ccf773cdcb",
-		.want = "87229107047a3b611920d6e3b2c0c89bea4f49412260b8dd",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "8887c276edeed3e9e866b46d58d895c73fbd80b63e382e88",
-		.peer_y = "04c5097ba6645e16206cfb70f7052655947dd44a17f1f9d5",
-		.priv = "e6747b9c23ba7044f38ff7e62c35e4038920f5a0163d3cda",
-		.pub_x = "2b838dbe73735f37a39a78d3195783d26991e86ff4d92d1a",
-		.pub_y = "60d344942274489f98903b2e7f93f8d197fc9ae60a0ed53a",
-		.want = "eec0bed8fc55e1feddc82158fd6dc0d48a4d796aaf47d46c",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "0d045f30254adc1fcefa8a5b1f31bf4e739dd327cd18d594",
-		.peer_y = "542c314e41427c08278a08ce8d7305f3b5b849c72d8aff73",
-		.priv = "beabedd0154a1afcfc85d52181c10f5eb47adc51f655047d",
-		.pub_x = "1f65cf6e8978e1c1bc10bb61a7db311de310088c8cf9768b",
-		.pub_y = "f7d438168e7f42ab14b16af53a7a2f646ff40b53d74cbcc7",
-		.want = "716e743b1b37a2cd8479f0a3d5a74c10ba2599be18d7e2f4",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "fb35ca20d2e96665c51b98e8f6eb3d79113508d8bccd4516",
-		.peer_y = "368eec0d5bfb847721df6aaff0e5d48c444f74bf9cd8a5a7",
-		.priv = "cf70354226667321d6e2baf40999e2fd74c7a0f793fa8699",
-		.pub_x = "5f4844ffcce61005d24f737db98675e92f7b6543aeb6106c",
-		.pub_y = "5424f598139215d389b6b12b86d58014857f2ddadb540f51",
-		.want = "f67053b934459985a315cb017bf0302891798d45d0e19508",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "824752960c1307e5f13a83da21c7998ca8b5b00b9549f6d0",
-		.peer_y = "bc52d91e234363bc32ee0b6778f25cd8c1847510f4348b94",
-		.priv = "fe942515237fffdd7b4eb5c64909eee4856a076cdf12bae2",
-		.pub_x = "e6369df79b207b8b8679f7c869cfc264859d1ab55aa401e8",
-		.pub_y = "1f99c71f801a30b52f74da6e5e6dbb62ee4c5da1090cc020",
-		.want = "75822971193edd472bf30151a782619c55ad0b279c9303dd",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "10bb57020291141981f833b4749e5611034b308e84011d21",
-		.peer_y = "e1cacd6b7bd17ed8ddb50b6aee0654c35f2d0eddc1cffcf6",
-		.priv = "33fed10492afa5bea0333c0af12cac940c4d222455bcd0fe",
-		.pub_x = "ef0b28afc41637d737f42e4c8aaceadc84ba2e0b849ca18c",
-		.pub_y = "57797942e552173bba17f73278e029f42335068bd770ddf2",
-		.want = "67cba2cbb69ee78bf1abafb0e6fbe33fa2094c128d59652d",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "5192fce4185a7758ea1bc56e0e4f4e8b2dce32348d0dced1",
-		.peer_y = "20989981beaaf0006d88a96e7971a2fa3a33ba46047fc7ba",
-		.priv = "f3557c5d70b4c7954960c33568776adbe8e43619abe26b13",
-		.pub_x = "d70112c5f0f0844386494ac1ad99dce2214134176ebfb9af",
-		.pub_y = "d3c187a038510ab31d459e2b7af1a380dd7576af06267548",
-		.want = "cf99a2770a386ca0137d1eca0a226e484297ac3c513f3631",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "26d019dbe279ead01eed143a91601ada26e2f42225b1c62b",
-		.peer_y = "6ca653f08272e0386fc9421fbd580093d7ae6301bca94476",
-		.priv = "586cfba1c6e81766ed52828f177b1be14ebbc5b83348c311",
-		.pub_x = "58b3c63e56bec9d696bf9a88df2873738391f76368aa2b49",
-		.pub_y = "5776773b261faf7ba2fdc4fe43b92c0b1c7a2fd054a43650",
-		.want = "576331e2b4fb38a112810e1529834de8307fb0a0d2756877",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "539bc40fe20a0fb267888b647b03eaaf6ec20c02a1e1f8c8",
-		.peer_y = "69095e5bb7b4d44c3278a7ee6beca397c45246da9a34c8be",
-		.priv = "cad8100603a4f65be08d8fc8a1b7e884c5ff65deb3c96d99",
-		.pub_x = "b7fcc0f52c7a411edbed39e10bf02b6ae0f26614c6b325a2",
-		.pub_y = "47483b26eb67776de2b93ab7119d5447573739e3d55e72fb",
-		.want = "902f4501916a0dd945554c3a37b3d780d375a6da713197c4",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "5d343ddb96318fb4794d10f6c573f99fee5d0d57b996250f",
-		.peer_y = "99fbdf9d97dd88ad410235dac36e5b92ce2824b8e587a82c",
-		.priv = "1edd879cc5c79619cae6c73a691bd5a0395c0ef3b356fcd2",
-		.pub_x = "6ce6adb2c30808f590048c33dffad4524ebf7a5fd39b747b",
-		.pub_y = "4966bd2f3d00569b4d4c0409fbd7a2db752f6d09bca8c25f",
-		.want = "46e4de335054d429863218ae33636fc9b89c628b64b506c7",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "8d3db9bdce137ffbfb891388c37df6c0cbc90aa5e5376220",
-		.peer_y = "135d30b5cb660eef8764ffc744f15c1b5d6dc06ba4416d37",
-		.priv = "460e452273fe1827602187ad3bebee65cb84423bb4f47537",
-		.pub_x = "d1bd3a3efabf4767fe6380bdf0dbf49d52d4cf0cbb89404c",
-		.pub_y = "c150c2b4c8b3aa35f765f847e4f7f8fd8704d241a181ee99",
-		.want = "1bfe9e5a20ac7a38d8f605b425bb9030be31ef97c101c76c",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "9e0a6949519c7f5be68c0433c5fdf13064aa13fb29483dc3",
-		.peer_y = "e1c8ba63e1f471db23185f50d9c871edea21255b3a63b4b7",
-		.priv = "b970365008456f8758ecc5a3b33cf3ae6a8d568107a52167",
-		.pub_x = "c1b8610c8c63f8d4abda093b9a11a566044bf65c6faa8999",
-		.pub_y = "a5bc4b3ca095382e9738aee95fe9479b17879b3ad5295559",
-		.want = "0e8c493a4adc445dc9288a3b9b272599224054592d7265b3",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "be088238902e9939b3d054eeeb8492daf4bdcf09a2ab77f1",
-		.peer_y = "58d6749a3a923dc80440f2661fd35b651617e65294b46375",
-		.priv = "59c15b8a2464e41dfe4371c7f7dadf470ae425544f8113bd",
-		.pub_x = "1fe776f73567b6ac0b0d6764164de6c5be751ba8d1ff455e",
-		.pub_y = "4c160bf38afb2b71f684261664115ce874553e8b059432d2",
-		.want = "0f1991086b455ded6a1c4146f7bf59fe9b495de566ebc6bf",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "bf5ae05025e1be617e666d87a4168363873d5761b376b503",
-		.peer_y = "e1e6e38b372b6bee0ff5b3502d83735e3b2c26825e4f0fcc",
-		.priv = "a6e9b885c66b959d1fc2708d591b6d3228e49eb98f726d61",
-		.pub_x = "632bb7651dbf49dde9dd125d13fb234e06617723beed3d1b",
-		.pub_y = "f4ad5209638488397c5f44f994dd7479807e79f4887d2e71",
-		.want = "b30f2127c34df35aaa91dbf0bbe15798e799a03ed11698c1",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "6cc4feed84c7ab0d09005d660ed34de6955a9461c4138d11",
-		.peer_y = "31225f33864ed48da06fa45a913b46cf42557742e35085e6",
-		.priv = "bdb754096ffbfbd8b0f3cb046ccb7ca149c4e7192067a3ee",
-		.pub_x = "d9c098d421d741f6faab116f3e4731d28c5558e19fe112a1",
-		.pub_y = "38d4dc48ccdb1d3ed8d31fd06784a4f87a68aec1cbd5b08f",
-		.want = "64a5c246599d3e8177a2402a1110eb81e6c456ab4edb5127",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "36157315bee7afedded58c4e8ba14d3421c401e51135bcc9",
-		.peer_y = "37c297ca703f77c52bb062d8ce971db84097ba0c753a418f",
-		.priv = "d5bcf2534dafc3d99964c7bd63ab7bd15999fe56dd969c42",
-		.pub_x = "fda1d5d28d6fe0e7909d6a8bafa7824db5572ab92ffe7de6",
-		.pub_y = "134a297c1d9c8bbab249abacd951ed11e5a99f92e7991572",
-		.want = "017b8ca53c82fab163da2ab783966a39e061b32c8cfa334d",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "98464d47f0256f8292e027e8c92582ea77cf9051f5ce8e5d",
-		.peer_y = "449552ef7578be96236fe5ed9d0643c0bb6c5a9134b0108d",
-		.priv = "43d4b9df1053be5b4268104c02244d3bf9594b010b46a8b2",
-		.pub_x = "c3020b7091463d788f1f1d76f7cfeec82ecdb3b7d99c345c",
-		.pub_y = "9a7710d5179591d8f3df0aa122301768ae7db7eee2d7f583",
-		.want = "340ef3db3dbebdd91c62c3d4e1a3da2c7c52a3338b865259",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "563eb66c334cf6f123bf04c7803b48a3110214237e983bf5",
-		.peer_y = "0f351104819199ef07c9a6051d20758f3af79027ea66a53f",
-		.priv = "94cac2c2ca714746401670d94edbf3f677867b5a03bee7ad",
-		.pub_x = "b18554a2e743ef0aa2f040987c4c451004e096df3d80ddae",
-		.pub_y = "6e3e2c618f896e36ba620077684b70a05ffb79bf5e6c7640",
-		.want = "2162144921df5103d0e6a650fb13fd246f4738d0896ce92f",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "86828c4ac92b5507618aec7873a1d4fc6543c5be33cf3078",
-		.peer_y = "b22ca72437545e10d6d4f052422eb898b737a4b8543ee550",
-		.priv = "2a3a9e33c8cc3107a9f9265c3bdea1206570e86f92ac7014",
-		.pub_x = "a7ba38be1bc669dd23ccfcee0645b1f0db8cf942deafaeb6",
-		.pub_y = "b82db79d80cd0e37f28d4163adc389dee8fc7797b5c9831b",
-		.want = "4c69e7feed4b11159adfc16a6047a92572ea44e0740b23af",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "6700a102437781a9581da2bc25ced5abf419da91d3c803df",
-		.peer_y = "71396c9cf08bcd91854e3e6e42d8c657ce0f27ab77a9dc4b",
-		.priv = "4a6b78a98ac98fa8e99a8ece08ec0251125f85c6fd0e289b",
-		.pub_x = "e769dbbcd5ce2d83514b768d3d2d5aa0bcd8f66af15f5500",
-		.pub_y = "2fc6d0b039e0f28f74fbeffe9e883d4dd72296e4e95cae71",
-		.want = "46072acefd67bff50de355ca7a31fa6be59f26e467587259",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "a82f354cf97bee5d22dc6c079f2902ead44d96a8f614f178",
-		.peer_y = "a654a9aa8a1a0802f2ce0ee8a0f4ebe96dee1b37464b1ff2",
-		.priv = "c5a6491d78844d6617ef33be6b8bd54da221450885d5950f",
-		.pub_x = "db1b24f7466bc154e9d7d2c3ca52dcfe0bfc9563c5fdb6f3",
-		.pub_y = "1c74fbbf5bd99921f1a9a744f8e1cf770bd6a76a772b3003",
-		.want = "ec5580eabca9f3389d2b427ddf6e49e26d629afd03fa766e",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "3cec21b28668a12a2cf78e1a8e55d0efe065152fffc34718",
-		.peer_y = "1029557beba4ff1992bd21c23cb4825f6dae70e3318fd1ca",
-		.priv = "2ba2703c5e23f6463c5b88dc37292fabd3399b5e1fb67c05",
-		.pub_x = "7543148906cef9b37a71a7c08363cdd3bba50142d65241aa",
-		.pub_y = "8b3a6973de8dc271e27c1ead1e962fdaae3710c724daac38",
-		.want = "7f3929dd3cbf7673bc30d859d90b880307475f800660ea32",
-	},
-	{
-		.nid = NID_X9_62_prime192v1,
-		.peer_x = "7082644715b8b731f8228b5118e7270d34d181f361a221fc",
-		.peer_y = "464649d6c88ca89614488a1cc7b8442bb42f9fb3020a3d76",
-		.priv = "836118c6248f882e9147976f764826c1a28755a6102977d5",
-		.pub_x = "fcd345a976c720caaa97de6697226825615e1287a9eff67e",
-		.pub_y = "58ea42edbeeafca9ff44cfd7f29abd2cbde7626d79e422c9",
-		.want = "72e88f3ea67d46d46dbf83926e7e2a6b85b54536741e6d2c",
-	},
-#endif /* ENABLE_SMALL_CURVES */
-
 	{
 		.nid = NID_secp224r1,
 		.peer_x =
diff --git a/src/regress/lib/libcrypto/ecdh/ecdhtest.c b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
index 2f726ecb50..465a45d1da 100644
--- a/src/regress/lib/libcrypto/ecdh/ecdhtest.c
+++ b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecdhtest.c,v 1.21 2024/11/24 10:13:16 tb Exp $ */
+/*	$OpenBSD: ecdhtest.c,v 1.22 2024/12/24 18:32:31 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -174,14 +174,6 @@ static const struct ecdh_kat_test {
     const char *want;
 } ecdh_kat_tests[] = {
 	/* Keys and shared secrets from RFC 5114 */
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.nid =	NID_X9_62_prime192v1,
-		.keya =	"323fa3169d8e9c6593f59476bc142000ab5be0e249c43426",
-		.keyb =	"631f95bb4a67632c9c476eee9ab695ab240a0499307fcf62",
-		.want =	"ad420182633f8526bfe954acda376f05e5ff4f837f54febe",
-	},
-#endif
 	{
 		.nid =	NID_secp224r1,
 		.keya =	"b558eb6c288da707bbb4f8fbae2ab9e9cb62e3bc5c7573e2"
-- 
cgit v1.2.3-55-g6feb