summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-12-24 18:32:31 +0000
committertb <>2024-12-24 18:32:31 +0000
commit998dca5919395c28d8a45e44537bd6e801852eb2 (patch)
treefad351a5754763dda52e1bad8e7acdc4c864a84f /src
parentb1eba63695c02a7b0951a5c0dde982f7fb350e69 (diff)
downloadopenbsd-998dca5919395c28d8a45e44537bd6e801852eb2.tar.gz
openbsd-998dca5919395c28d8a45e44537bd6e801852eb2.tar.bz2
openbsd-998dca5919395c28d8a45e44537bd6e801852eb2.zip
Remove already disabled tests for elliptic curves of small order
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libcrypto/ec/ec_asn1_test.c643
-rw-r--r--src/regress/lib/libcrypto/ecdh/ecc_cdh.c230
-rw-r--r--src/regress/lib/libcrypto/ecdh/ecdhtest.c10
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 @@
1/* $OpenBSD: ec_asn1_test.c,v 1.30 2024/11/24 10:13:16 tb Exp $ */ 1/* $OpenBSD: ec_asn1_test.c,v 1.31 2024/12/24 18:32:31 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2017, 2021 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2017, 2021 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2024 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2024 Theo Buehler <tb@openbsd.org>
@@ -1035,245 +1035,6 @@ static const struct ec_private_key {
1035 int oct_len; 1035 int oct_len;
1036 uint8_t oct[256]; 1036 uint8_t oct[256];
1037} ec_private_keys[] = { 1037} ec_private_keys[] = {
1038#ifdef ENABLE_SMALL_CURVES
1039 {
1040 .name = "secp112r1",
1041 .der_len = 64,
1042 .der = {
1043 0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0x6a,
1044 0xbb, 0xb5, 0x15, 0xda, 0xa6, 0xe9, 0x85, 0x64,
1045 0xc4, 0x6c, 0x00, 0xef, 0x3f, 0xa0, 0x07, 0x06,
1046 0x05, 0x2b, 0x81, 0x04, 0x00, 0x06, 0xa1, 0x20,
1047 0x03, 0x1e, 0x00, 0x04, 0x0f, 0xa9, 0x6a, 0xcd,
1048 0x14, 0x65, 0x87, 0xe4, 0x2c, 0x58, 0x86, 0x1b,
1049 0x7a, 0x3d, 0x49, 0x3a, 0xaa, 0xeb, 0x97, 0xec,
1050 0x19, 0xa3, 0x92, 0x3d, 0xe7, 0xe6, 0x6e, 0x47,
1051 },
1052 .hex = "040FA96ACD146587"
1053 "E42C58861B7A3D49"
1054 "3AAAEB97EC19A392"
1055 "3DE7E66E47",
1056 .oct_len = 29,
1057 .oct = {
1058 0x04, 0x0f, 0xa9, 0x6a, 0xcd, 0x14, 0x65, 0x87,
1059 0xe4, 0x2c, 0x58, 0x86, 0x1b, 0x7a, 0x3d, 0x49,
1060 0x3a, 0xaa, 0xeb, 0x97, 0xec, 0x19, 0xa3, 0x92,
1061 0x3d, 0xe7, 0xe6, 0x6e, 0x47,
1062 },
1063 },
1064 {
1065 .name = "secp112r2",
1066 .der_len = 64,
1067 .der = {
1068 0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0x02,
1069 0x97, 0xb2, 0xbb, 0x96, 0xa4, 0xdb, 0x26, 0xd6,
1070 0x92, 0xb7, 0x75, 0x1c, 0x90, 0xa0, 0x07, 0x06,
1071 0x05, 0x2b, 0x81, 0x04, 0x00, 0x07, 0xa1, 0x20,
1072 0x03, 0x1e, 0x00, 0x04, 0x64, 0x2d, 0x25, 0x53,
1073 0x3f, 0x43, 0xf2, 0x69, 0xb2, 0x55, 0x8d, 0x7c,
1074 0xfd, 0x57, 0x7a, 0x8f, 0x38, 0x8b, 0x04, 0xd9,
1075 0xae, 0x3b, 0xcf, 0x10, 0x30, 0x29, 0xdb, 0x59,
1076 },
1077 .hex = "04642D25533F43F2"
1078 "69B2558D7CFD577A"
1079 "8F388B04D9AE3BCF"
1080 "103029DB59",
1081 .oct_len = 29,
1082 .oct = {
1083 0x04, 0x64, 0x2d, 0x25, 0x53, 0x3f, 0x43, 0xf2,
1084 0x69, 0xb2, 0x55, 0x8d, 0x7c, 0xfd, 0x57, 0x7a,
1085 0x8f, 0x38, 0x8b, 0x04, 0xd9, 0xae, 0x3b, 0xcf,
1086 0x10, 0x30, 0x29, 0xdb, 0x59,
1087 },
1088 },
1089 {
1090 .name = "secp128r1",
1091 .der_len = 70,
1092 .der = {
1093 0x30, 0x44, 0x02, 0x01, 0x01, 0x04, 0x10, 0x07,
1094 0xd8, 0x7a, 0xf8, 0xda, 0xaf, 0x45, 0x03, 0xb5,
1095 0x68, 0x63, 0xbd, 0xda, 0xcb, 0xd7, 0x70, 0xa0,
1096 0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1c,
1097 0xa1, 0x24, 0x03, 0x22, 0x00, 0x04, 0x3f, 0x88,
1098 0x45, 0x10, 0x52, 0xc2, 0xf6, 0x56, 0x88, 0x1b,
1099 0x6e, 0xee, 0x30, 0x21, 0x64, 0x98, 0x74, 0xde,
1100 0x31, 0xaf, 0xd3, 0x85, 0x5e, 0x4d, 0xc0, 0xee,
1101 0x06, 0x4c, 0x26, 0x6d, 0x5e, 0x6d,
1102 },
1103 .hex = "043F88451052C2F6"
1104 "56881B6EEE302164"
1105 "9874DE31AFD3855E"
1106 "4DC0EE064C266D5E"
1107 "6D",
1108 .oct_len = 33,
1109 .oct = {
1110 0x04, 0x3f, 0x88, 0x45, 0x10, 0x52, 0xc2, 0xf6,
1111 0x56, 0x88, 0x1b, 0x6e, 0xee, 0x30, 0x21, 0x64,
1112 0x98, 0x74, 0xde, 0x31, 0xaf, 0xd3, 0x85, 0x5e,
1113 0x4d, 0xc0, 0xee, 0x06, 0x4c, 0x26, 0x6d, 0x5e,
1114 0x6d,
1115 },
1116 },
1117 {
1118 .name = "secp128r2",
1119 .der_len = 70,
1120 .der = {
1121 0x30, 0x44, 0x02, 0x01, 0x01, 0x04, 0x10, 0x16,
1122 0x97, 0x3c, 0x79, 0xa0, 0x8f, 0x38, 0x41, 0x25,
1123 0x64, 0xc6, 0x81, 0x5a, 0xce, 0xe4, 0x9f, 0xa0,
1124 0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1d,
1125 0xa1, 0x24, 0x03, 0x22, 0x00, 0x04, 0xd5, 0xf5,
1126 0x1c, 0x2f, 0x02, 0xc0, 0x39, 0xeb, 0x6c, 0x7b,
1127 0x20, 0x2b, 0xcf, 0x67, 0xe0, 0x8a, 0x2b, 0x83,
1128 0x0d, 0x54, 0x61, 0xa0, 0xf3, 0x32, 0xdc, 0xe1,
1129 0x19, 0xbb, 0x6e, 0xcf, 0x3c, 0xe2,
1130 },
1131 .hex = "04D5F51C2F02C039"
1132 "EB6C7B202BCF67E0"
1133 "8A2B830D5461A0F3"
1134 "32DCE119BB6ECF3C"
1135 "E2",
1136 .oct_len = 33,
1137 .oct = {
1138 0x04, 0xd5, 0xf5, 0x1c, 0x2f, 0x02, 0xc0, 0x39,
1139 0xeb, 0x6c, 0x7b, 0x20, 0x2b, 0xcf, 0x67, 0xe0,
1140 0x8a, 0x2b, 0x83, 0x0d, 0x54, 0x61, 0xa0, 0xf3,
1141 0x32, 0xdc, 0xe1, 0x19, 0xbb, 0x6e, 0xcf, 0x3c,
1142 0xe2,
1143 },
1144 },
1145 {
1146 .name = "secp160k1",
1147 .der_len = 83,
1148 .der = {
1149 0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
1150 0x3c, 0x42, 0x8b, 0x77, 0x87, 0x63, 0xab, 0x61,
1151 0xff, 0x18, 0xf5, 0x96, 0xa6, 0x41, 0x48, 0xf6,
1152 0xf5, 0x85, 0xa5, 0x00, 0xa0, 0x07, 0x06, 0x05,
1153 0x2b, 0x81, 0x04, 0x00, 0x09, 0xa1, 0x2c, 0x03,
1154 0x2a, 0x00, 0x04, 0xfe, 0x46, 0xef, 0xa6, 0xde,
1155 0x95, 0x20, 0x34, 0x2e, 0x7c, 0x65, 0xe9, 0x31,
1156 0xef, 0x5b, 0xd6, 0xb2, 0x80, 0x0a, 0x03, 0xba,
1157 0xe8, 0xc6, 0x9c, 0x89, 0xff, 0x3d, 0x6b, 0xa5,
1158 0x63, 0x8d, 0x7f, 0x17, 0x3e, 0x28, 0x49, 0xcc,
1159 0xcd, 0x6e, 0xb0,
1160 },
1161 .hex = "04FE46EFA6DE9520"
1162 "342E7C65E931EF5B"
1163 "D6B2800A03BAE8C6"
1164 "9C89FF3D6BA5638D"
1165 "7F173E2849CCCD6E"
1166 "B0",
1167 .oct_len = 41,
1168 .oct = {
1169 0x04, 0xfe, 0x46, 0xef, 0xa6, 0xde, 0x95, 0x20,
1170 0x34, 0x2e, 0x7c, 0x65, 0xe9, 0x31, 0xef, 0x5b,
1171 0xd6, 0xb2, 0x80, 0x0a, 0x03, 0xba, 0xe8, 0xc6,
1172 0x9c, 0x89, 0xff, 0x3d, 0x6b, 0xa5, 0x63, 0x8d,
1173 0x7f, 0x17, 0x3e, 0x28, 0x49, 0xcc, 0xcd, 0x6e,
1174 0xb0,
1175 },
1176 },
1177 {
1178 .name = "secp160r1",
1179 .der_len = 83,
1180 .der = {
1181 0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
1182 0xbf, 0x64, 0xb4, 0xc1, 0x9b, 0xd7, 0x76, 0x1e,
1183 0xe8, 0x6f, 0xbf, 0x54, 0xa1, 0xfc, 0x7d, 0x4e,
1184 0xfa, 0xf3, 0xcd, 0x2c, 0xa0, 0x07, 0x06, 0x05,
1185 0x2b, 0x81, 0x04, 0x00, 0x08, 0xa1, 0x2c, 0x03,
1186 0x2a, 0x00, 0x04, 0xda, 0xf0, 0xda, 0x8c, 0xad,
1187 0x13, 0xe1, 0x12, 0x3b, 0x53, 0xef, 0x94, 0x98,
1188 0xa3, 0x57, 0x85, 0xbb, 0x20, 0xc0, 0xd8, 0xb6,
1189 0x61, 0xad, 0x44, 0x79, 0xd4, 0xbe, 0x3e, 0x6c,
1190 0xcb, 0xae, 0x9e, 0xe0, 0xa2, 0x7e, 0x26, 0x6b,
1191 0xfe, 0xc4, 0xa7,
1192 },
1193 .hex = "04DAF0DA8CAD13E1"
1194 "123B53EF9498A357"
1195 "85BB20C0D8B661AD"
1196 "4479D4BE3E6CCBAE"
1197 "9EE0A27E266BFEC4"
1198 "A7",
1199 .oct_len = 41,
1200 .oct = {
1201 0x04, 0xda, 0xf0, 0xda, 0x8c, 0xad, 0x13, 0xe1,
1202 0x12, 0x3b, 0x53, 0xef, 0x94, 0x98, 0xa3, 0x57,
1203 0x85, 0xbb, 0x20, 0xc0, 0xd8, 0xb6, 0x61, 0xad,
1204 0x44, 0x79, 0xd4, 0xbe, 0x3e, 0x6c, 0xcb, 0xae,
1205 0x9e, 0xe0, 0xa2, 0x7e, 0x26, 0x6b, 0xfe, 0xc4,
1206 0xa7,
1207 },
1208 },
1209 {
1210 .name = "secp160r2",
1211 .der_len = 83,
1212 .der = {
1213 0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
1214 0x86, 0x4b, 0xae, 0x32, 0x2a, 0x3a, 0xed, 0xb3,
1215 0xad, 0x02, 0x05, 0x6b, 0x0b, 0x9b, 0x3c, 0xae,
1216 0x51, 0xd9, 0x46, 0x3e, 0xa0, 0x07, 0x06, 0x05,
1217 0x2b, 0x81, 0x04, 0x00, 0x1e, 0xa1, 0x2c, 0x03,
1218 0x2a, 0x00, 0x04, 0x36, 0xce, 0x2a, 0xbb, 0xec,
1219 0x29, 0xdf, 0xda, 0x52, 0x21, 0x8b, 0x8b, 0x49,
1220 0x37, 0xe3, 0xd6, 0x7f, 0xab, 0x66, 0x20, 0x81,
1221 0xc7, 0x30, 0xeb, 0x00, 0xf0, 0xad, 0x66, 0x7c,
1222 0x79, 0x19, 0xdc, 0xb1, 0x03, 0xdc, 0xcb, 0x73,
1223 0x2b, 0x02, 0x63,
1224 },
1225 .hex = "0436CE2ABBEC29DF"
1226 "DA52218B8B4937E3"
1227 "D67FAB662081C730"
1228 "EB00F0AD667C7919"
1229 "DCB103DCCB732B02"
1230 "63",
1231 .oct_len = 41,
1232 .oct = {
1233 0x04, 0x36, 0xce, 0x2a, 0xbb, 0xec, 0x29, 0xdf,
1234 0xda, 0x52, 0x21, 0x8b, 0x8b, 0x49, 0x37, 0xe3,
1235 0xd6, 0x7f, 0xab, 0x66, 0x20, 0x81, 0xc7, 0x30,
1236 0xeb, 0x00, 0xf0, 0xad, 0x66, 0x7c, 0x79, 0x19,
1237 0xdc, 0xb1, 0x03, 0xdc, 0xcb, 0x73, 0x2b, 0x02,
1238 0x63,
1239 },
1240 },
1241 {
1242 .name = "secp192k1",
1243 .der_len = 94,
1244 .der = {
1245 0x30, 0x5c, 0x02, 0x01, 0x01, 0x04, 0x18, 0x6b,
1246 0x81, 0x52, 0x97, 0xaf, 0xd3, 0x6b, 0xf3, 0xdb,
1247 0xff, 0xaf, 0x73, 0x66, 0x83, 0x09, 0x84, 0x78,
1248 0x87, 0xe1, 0xfb, 0x17, 0x35, 0x87, 0x3f, 0xa0,
1249 0x07, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x1f,
1250 0xa1, 0x34, 0x03, 0x32, 0x00, 0x04, 0xa8, 0x7c,
1251 0x1e, 0x15, 0xf0, 0x1c, 0x8a, 0x8d, 0x7e, 0x14,
1252 0xdb, 0x07, 0xd1, 0xac, 0xaf, 0x25, 0x77, 0xe5,
1253 0x39, 0xbd, 0x59, 0x5a, 0xed, 0x64, 0x14, 0xef,
1254 0xd3, 0xf2, 0x33, 0xab, 0x7b, 0xd5, 0x9e, 0x2a,
1255 0x95, 0xed, 0x6f, 0x61, 0x83, 0xc3, 0x06, 0x27,
1256 0x0c, 0x73, 0x6e, 0x73, 0x7c, 0xdc,
1257 },
1258 .hex = "04A87C1E15F01C8A"
1259 "8D7E14DB07D1ACAF"
1260 "2577E539BD595AED"
1261 "6414EFD3F233AB7B"
1262 "D59E2A95ED6F6183"
1263 "C306270C736E737C"
1264 "DC",
1265 .oct_len = 49,
1266 .oct = {
1267 0x04, 0xa8, 0x7c, 0x1e, 0x15, 0xf0, 0x1c, 0x8a,
1268 0x8d, 0x7e, 0x14, 0xdb, 0x07, 0xd1, 0xac, 0xaf,
1269 0x25, 0x77, 0xe5, 0x39, 0xbd, 0x59, 0x5a, 0xed,
1270 0x64, 0x14, 0xef, 0xd3, 0xf2, 0x33, 0xab, 0x7b,
1271 0xd5, 0x9e, 0x2a, 0x95, 0xed, 0x6f, 0x61, 0x83,
1272 0xc3, 0x06, 0x27, 0x0c, 0x73, 0x6e, 0x73, 0x7c,
1273 0xdc,
1274 },
1275 },
1276#endif /* ENABLE_SMALL_CURVES */
1277 { 1038 {
1278 .name = "secp224k1", 1039 .name = "secp224k1",
1279 .der_len = 107, 1040 .der_len = 107,
@@ -1521,116 +1282,6 @@ static const struct ec_private_key {
1521 0x9c, 0x6b, 0xce, 0xc4, 0x8e, 1282 0x9c, 0x6b, 0xce, 0xc4, 0x8e,
1522 }, 1283 },
1523 }, 1284 },
1524#ifdef ENABLE_SMALL_CURVES
1525 {
1526 .name = "prime192v1",
1527 .der_len = 97,
1528 .der = {
1529 0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x70,
1530 0x28, 0x4b, 0x5c, 0x39, 0xf6, 0x28, 0xea, 0xe0,
1531 0xf4, 0xbc, 0x95, 0x12, 0x05, 0x4e, 0xee, 0x61,
1532 0x84, 0x3e, 0xbc, 0xe7, 0xae, 0x6c, 0x28, 0xa0,
1533 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
1534 0x03, 0x01, 0x01, 0xa1, 0x34, 0x03, 0x32, 0x00,
1535 0x04, 0x6e, 0x8a, 0x84, 0x2c, 0x8a, 0x39, 0xee,
1536 0x94, 0x6b, 0xb2, 0x8a, 0x17, 0x8e, 0x96, 0x5e,
1537 0xa2, 0x0f, 0x2e, 0xb0, 0x73, 0x43, 0x56, 0x46,
1538 0xf1, 0x02, 0xe8, 0xa6, 0x81, 0x41, 0x93, 0x74,
1539 0xfe, 0xe6, 0x4c, 0xf6, 0xb9, 0x5a, 0x39, 0x18,
1540 0x6a, 0xba, 0x4e, 0x52, 0xeb, 0x29, 0x81, 0x87,
1541 0x92,
1542 },
1543 .hex = "046E8A842C8A39EE"
1544 "946BB28A178E965E"
1545 "A20F2EB073435646"
1546 "F102E8A681419374"
1547 "FEE64CF6B95A3918"
1548 "6ABA4E52EB298187"
1549 "92",
1550 .oct_len = 49,
1551 .oct = {
1552 0x04, 0x6e, 0x8a, 0x84, 0x2c, 0x8a, 0x39, 0xee,
1553 0x94, 0x6b, 0xb2, 0x8a, 0x17, 0x8e, 0x96, 0x5e,
1554 0xa2, 0x0f, 0x2e, 0xb0, 0x73, 0x43, 0x56, 0x46,
1555 0xf1, 0x02, 0xe8, 0xa6, 0x81, 0x41, 0x93, 0x74,
1556 0xfe, 0xe6, 0x4c, 0xf6, 0xb9, 0x5a, 0x39, 0x18,
1557 0x6a, 0xba, 0x4e, 0x52, 0xeb, 0x29, 0x81, 0x87,
1558 0x92,
1559 },
1560 },
1561 {
1562 .name = "prime192v2",
1563 .der_len = 97,
1564 .der = {
1565 0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x1a,
1566 0x8a, 0x60, 0x51, 0xe0, 0xd6, 0x66, 0x15, 0x47,
1567 0xba, 0xec, 0xec, 0x0c, 0xa6, 0x26, 0xd4, 0x6d,
1568 0x60, 0x81, 0x22, 0xe6, 0xb2, 0x43, 0x5b, 0xa0,
1569 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
1570 0x03, 0x01, 0x02, 0xa1, 0x34, 0x03, 0x32, 0x00,
1571 0x04, 0x62, 0x5d, 0xfb, 0x0e, 0x58, 0x95, 0xd1,
1572 0xe7, 0x13, 0x66, 0x9a, 0x0c, 0x5c, 0xef, 0x2f,
1573 0x2f, 0x33, 0xbb, 0x2b, 0xa0, 0x09, 0x6e, 0x04,
1574 0x3e, 0x01, 0x3c, 0x60, 0x5e, 0xc3, 0xba, 0xfc,
1575 0x1c, 0xb9, 0x4d, 0x0d, 0xb5, 0xa9, 0x9e, 0x56,
1576 0x4b, 0xab, 0x5b, 0x66, 0xa7, 0x98, 0xa6, 0x9a,
1577 0xe6,
1578 },
1579 .hex = "04625DFB0E5895D1"
1580 "E713669A0C5CEF2F"
1581 "2F33BB2BA0096E04"
1582 "3E013C605EC3BAFC"
1583 "1CB94D0DB5A99E56"
1584 "4BAB5B66A798A69A"
1585 "E6",
1586 .oct_len = 49,
1587 .oct = {
1588 0x04, 0x62, 0x5d, 0xfb, 0x0e, 0x58, 0x95, 0xd1,
1589 0xe7, 0x13, 0x66, 0x9a, 0x0c, 0x5c, 0xef, 0x2f,
1590 0x2f, 0x33, 0xbb, 0x2b, 0xa0, 0x09, 0x6e, 0x04,
1591 0x3e, 0x01, 0x3c, 0x60, 0x5e, 0xc3, 0xba, 0xfc,
1592 0x1c, 0xb9, 0x4d, 0x0d, 0xb5, 0xa9, 0x9e, 0x56,
1593 0x4b, 0xab, 0x5b, 0x66, 0xa7, 0x98, 0xa6, 0x9a,
1594 0xe6,
1595 },
1596 },
1597 {
1598 .name = "prime192v3",
1599 .der_len = 97,
1600 .der = {
1601 0x30, 0x5f, 0x02, 0x01, 0x01, 0x04, 0x18, 0x9c,
1602 0x56, 0xc9, 0xaf, 0xc1, 0x86, 0x00, 0x04, 0x9a,
1603 0xb0, 0xb9, 0x11, 0x4c, 0x72, 0x07, 0xe7, 0xa5,
1604 0x4c, 0x73, 0x66, 0x4c, 0x14, 0x70, 0x33, 0xa0,
1605 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
1606 0x03, 0x01, 0x03, 0xa1, 0x34, 0x03, 0x32, 0x00,
1607 0x04, 0x51, 0x38, 0x9f, 0x96, 0x4e, 0x13, 0x0c,
1608 0xe2, 0x93, 0xee, 0xc6, 0x44, 0x10, 0xfd, 0xff,
1609 0xae, 0xd4, 0x08, 0x0f, 0x3a, 0x78, 0x71, 0xdc,
1610 0xfe, 0x6d, 0x46, 0x0e, 0xe4, 0xe6, 0x99, 0xd1,
1611 0x25, 0x8c, 0xb8, 0xc0, 0xe9, 0x7c, 0x7a, 0xd3,
1612 0xc8, 0xd8, 0x3a, 0xc5, 0x7d, 0xfb, 0x9c, 0x78,
1613 0xd3,
1614 },
1615 .hex = "0451389F964E130C"
1616 "E293EEC64410FDFF"
1617 "AED4080F3A7871DC"
1618 "FE6D460EE4E699D1"
1619 "258CB8C0E97C7AD3"
1620 "C8D83AC57DFB9C78"
1621 "D3",
1622 .oct_len = 49,
1623 .oct = {
1624 0x04, 0x51, 0x38, 0x9f, 0x96, 0x4e, 0x13, 0x0c,
1625 0xe2, 0x93, 0xee, 0xc6, 0x44, 0x10, 0xfd, 0xff,
1626 0xae, 0xd4, 0x08, 0x0f, 0x3a, 0x78, 0x71, 0xdc,
1627 0xfe, 0x6d, 0x46, 0x0e, 0xe4, 0xe6, 0x99, 0xd1,
1628 0x25, 0x8c, 0xb8, 0xc0, 0xe9, 0x7c, 0x7a, 0xd3,
1629 0xc8, 0xd8, 0x3a, 0xc5, 0x7d, 0xfb, 0x9c, 0x78,
1630 0xd3,
1631 },
1632 },
1633#endif /* ENABLE_SMALL_CURVES */
1634 { 1285 {
1635 .name = "prime239v1", 1286 .name = "prime239v1",
1636 .der_len = 115, 1287 .der_len = 115,
@@ -1794,298 +1445,6 @@ static const struct ec_private_key {
1794 0xe3, 1445 0xe3,
1795 }, 1446 },
1796 }, 1447 },
1797#ifdef ENABLE_SMALL_CURVES
1798 {
1799 .name = "wap-wsg-idm-ecid-wtls6",
1800 .der_len = 64,
1801 .der = {
1802 0x30, 0x3e, 0x02, 0x01, 0x01, 0x04, 0x0e, 0xb0,
1803 0x78, 0x23, 0x28, 0xc9, 0xb6, 0x9a, 0x7f, 0xad,
1804 0x36, 0xa8, 0x56, 0x6c, 0xc8, 0xa0, 0x07, 0x06,
1805 0x05, 0x67, 0x2b, 0x01, 0x04, 0x06, 0xa1, 0x20,
1806 0x03, 0x1e, 0x00, 0x04, 0x56, 0x3f, 0x72, 0xf1,
1807 0xb5, 0xee, 0x7a, 0x4c, 0x59, 0x76, 0xd4, 0x97,
1808 0x43, 0x15, 0x6e, 0x27, 0x8a, 0x4f, 0x28, 0x11,
1809 0xb8, 0xf6, 0x80, 0xfe, 0x7a, 0xb1, 0xa2, 0x74,
1810 },
1811 .hex = "04563F72F1B5EE7A"
1812 "4C5976D49743156E"
1813 "278A4F2811B8F680"
1814 "FE7AB1A274",
1815 .oct_len = 29,
1816 .oct = {
1817 0x04, 0x56, 0x3f, 0x72, 0xf1, 0xb5, 0xee, 0x7a,
1818 0x4c, 0x59, 0x76, 0xd4, 0x97, 0x43, 0x15, 0x6e,
1819 0x27, 0x8a, 0x4f, 0x28, 0x11, 0xb8, 0xf6, 0x80,
1820 0xfe, 0x7a, 0xb1, 0xa2, 0x74,
1821 },
1822 },
1823 {
1824 .name = "wap-wsg-idm-ecid-wtls7",
1825 .der_len = 83,
1826 .der = {
1827 0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
1828 0x4a, 0x5e, 0xc3, 0x6c, 0x1d, 0xd5, 0xf3, 0x1b,
1829 0x2e, 0xf1, 0x3a, 0xd3, 0xae, 0x05, 0xc1, 0x6a,
1830 0x90, 0xa4, 0xc2, 0x85, 0xa0, 0x07, 0x06, 0x05,
1831 0x67, 0x2b, 0x01, 0x04, 0x07, 0xa1, 0x2c, 0x03,
1832 0x2a, 0x00, 0x04, 0xaf, 0x84, 0x2d, 0x08, 0xcb,
1833 0xe2, 0xf2, 0xa3, 0xac, 0x20, 0xb0, 0x99, 0x5c,
1834 0x38, 0xd7, 0x5e, 0xce, 0xb9, 0x0b, 0x2e, 0x38,
1835 0xdd, 0xcf, 0x13, 0x7f, 0x5a, 0xfa, 0xac, 0x1d,
1836 0x92, 0x2e, 0x9a, 0xa9, 0x73, 0x2b, 0xc3, 0x06,
1837 0x0e, 0x4e, 0x69,
1838 },
1839 .hex = "04AF842D08CBE2F2"
1840 "A3AC20B0995C38D7"
1841 "5ECEB90B2E38DDCF"
1842 "137F5AFAAC1D922E"
1843 "9AA9732BC3060E4E"
1844 "69",
1845 .oct_len = 41,
1846 .oct = {
1847 0x04, 0xaf, 0x84, 0x2d, 0x08, 0xcb, 0xe2, 0xf2,
1848 0xa3, 0xac, 0x20, 0xb0, 0x99, 0x5c, 0x38, 0xd7,
1849 0x5e, 0xce, 0xb9, 0x0b, 0x2e, 0x38, 0xdd, 0xcf,
1850 0x13, 0x7f, 0x5a, 0xfa, 0xac, 0x1d, 0x92, 0x2e,
1851 0x9a, 0xa9, 0x73, 0x2b, 0xc3, 0x06, 0x0e, 0x4e,
1852 0x69,
1853 },
1854 },
1855 {
1856 .name = "wap-wsg-idm-ecid-wtls8",
1857 .der_len = 65,
1858 .der = {
1859 0x30, 0x3f, 0x02, 0x01, 0x01, 0x04, 0x0f, 0x00,
1860 0x65, 0x6b, 0x08, 0x24, 0x76, 0xd2, 0xbe, 0xc6,
1861 0xc2, 0x44, 0x9a, 0xc8, 0x86, 0xdb, 0xa0, 0x07,
1862 0x06, 0x05, 0x67, 0x2b, 0x01, 0x04, 0x08, 0xa1,
1863 0x20, 0x03, 0x1e, 0x00, 0x04, 0x48, 0x81, 0x4b,
1864 0xae, 0x65, 0xf8, 0xda, 0x02, 0x2c, 0x66, 0xc6,
1865 0x0b, 0x1d, 0xa6, 0x98, 0x42, 0x25, 0xf2, 0x31,
1866 0x52, 0x3c, 0x6a, 0x6a, 0x2f, 0x69, 0x1a, 0x06,
1867 0x56,
1868 },
1869 .hex = "0448814BAE65F8DA"
1870 "022C66C60B1DA698"
1871 "4225F231523C6A6A"
1872 "2F691A0656",
1873 .oct_len = 29,
1874 .oct = {
1875 0x04, 0x48, 0x81, 0x4b, 0xae, 0x65, 0xf8, 0xda,
1876 0x02, 0x2c, 0x66, 0xc6, 0x0b, 0x1d, 0xa6, 0x98,
1877 0x42, 0x25, 0xf2, 0x31, 0x52, 0x3c, 0x6a, 0x6a,
1878 0x2f, 0x69, 0x1a, 0x06, 0x56,
1879 },
1880 },
1881 {
1882 .name = "wap-wsg-idm-ecid-wtls9",
1883 .der_len = 83,
1884 .der = {
1885 0x30, 0x51, 0x02, 0x01, 0x01, 0x04, 0x15, 0x00,
1886 0xf4, 0x0c, 0x58, 0x87, 0xc4, 0xb6, 0x20, 0xf5,
1887 0x18, 0xc2, 0x46, 0x9b, 0x2d, 0xbf, 0x1d, 0x56,
1888 0x26, 0x07, 0x7f, 0x85, 0xa0, 0x07, 0x06, 0x05,
1889 0x67, 0x2b, 0x01, 0x04, 0x09, 0xa1, 0x2c, 0x03,
1890 0x2a, 0x00, 0x04, 0xaa, 0xfc, 0xe4, 0xfe, 0xf8,
1891 0x91, 0x48, 0xf1, 0xcc, 0x49, 0x44, 0x35, 0x3d,
1892 0x49, 0x71, 0x44, 0xdc, 0x74, 0x73, 0x5b, 0x5f,
1893 0x01, 0x4b, 0xab, 0x8b, 0x5c, 0x84, 0xec, 0x2b,
1894 0xfa, 0x7e, 0xdc, 0x50, 0xc4, 0xac, 0xea, 0x84,
1895 0x2f, 0xba, 0x3c,
1896 },
1897 .hex = "04AAFCE4FEF89148"
1898 "F1CC4944353D4971"
1899 "44DC74735B5F014B"
1900 "AB8B5C84EC2BFA7E"
1901 "DC50C4ACEA842FBA"
1902 "3C",
1903 .oct_len = 41,
1904 .oct = {
1905 0x04, 0xaa, 0xfc, 0xe4, 0xfe, 0xf8, 0x91, 0x48,
1906 0xf1, 0xcc, 0x49, 0x44, 0x35, 0x3d, 0x49, 0x71,
1907 0x44, 0xdc, 0x74, 0x73, 0x5b, 0x5f, 0x01, 0x4b,
1908 0xab, 0x8b, 0x5c, 0x84, 0xec, 0x2b, 0xfa, 0x7e,
1909 0xdc, 0x50, 0xc4, 0xac, 0xea, 0x84, 0x2f, 0xba,
1910 0x3c,
1911 },
1912 },
1913 {
1914 .name = "wap-wsg-idm-ecid-wtls12",
1915 .der_len = 106,
1916 .der = {
1917 0x30, 0x68, 0x02, 0x01, 0x01, 0x04, 0x1c, 0x19,
1918 0x63, 0x30, 0xa6, 0x6b, 0xd3, 0xc6, 0x7a, 0x65,
1919 0xec, 0x6f, 0xe9, 0x2a, 0x37, 0x12, 0xa1, 0x44,
1920 0xe0, 0x42, 0x26, 0x4e, 0x11, 0xc4, 0xec, 0x2b,
1921 0x0a, 0x8b, 0x96, 0xa0, 0x07, 0x06, 0x05, 0x67,
1922 0x2b, 0x01, 0x04, 0x0c, 0xa1, 0x3c, 0x03, 0x3a,
1923 0x00, 0x04, 0x47, 0xd6, 0x63, 0x27, 0xe1, 0xad,
1924 0x30, 0xac, 0xba, 0xab, 0x86, 0xd6, 0x63, 0xb5,
1925 0xd9, 0xc5, 0x9c, 0x24, 0x3a, 0xd9, 0x6a, 0x7a,
1926 0x5d, 0x2b, 0x45, 0x71, 0x8d, 0x7e, 0xd2, 0x32,
1927 0x75, 0x65, 0xc4, 0x37, 0x25, 0xc7, 0x1f, 0xeb,
1928 0x33, 0xf7, 0x68, 0x29, 0x16, 0x82, 0x96, 0xd9,
1929 0x00, 0xaf, 0xdc, 0x4a, 0xe7, 0xc6, 0x61, 0x44,
1930 0x50, 0xc6,
1931 },
1932 .hex = "0447D66327E1AD30"
1933 "ACBAAB86D663B5D9"
1934 "C59C243AD96A7A5D"
1935 "2B45718D7ED23275"
1936 "65C43725C71FEB33"
1937 "F76829168296D900"
1938 "AFDC4AE7C6614450"
1939 "C6",
1940 .oct_len = 57,
1941 .oct = {
1942 0x04, 0x47, 0xd6, 0x63, 0x27, 0xe1, 0xad, 0x30,
1943 0xac, 0xba, 0xab, 0x86, 0xd6, 0x63, 0xb5, 0xd9,
1944 0xc5, 0x9c, 0x24, 0x3a, 0xd9, 0x6a, 0x7a, 0x5d,
1945 0x2b, 0x45, 0x71, 0x8d, 0x7e, 0xd2, 0x32, 0x75,
1946 0x65, 0xc4, 0x37, 0x25, 0xc7, 0x1f, 0xeb, 0x33,
1947 0xf7, 0x68, 0x29, 0x16, 0x82, 0x96, 0xd9, 0x00,
1948 0xaf, 0xdc, 0x4a, 0xe7, 0xc6, 0x61, 0x44, 0x50,
1949 0xc6,
1950 },
1951 },
1952 {
1953 .name = "brainpoolP160r1",
1954 .der_len = 86,
1955 .der = {
1956 0x30, 0x54, 0x02, 0x01, 0x01, 0x04, 0x14, 0x97,
1957 0x68, 0xac, 0xb7, 0x50, 0x24, 0x24, 0x39, 0x41,
1958 0x6e, 0x90, 0x27, 0xea, 0x6f, 0xaa, 0x11, 0x29,
1959 0xa2, 0x4e, 0xae, 0xa0, 0x0b, 0x06, 0x09, 0x2b,
1960 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x01,
1961 0xa1, 0x2c, 0x03, 0x2a, 0x00, 0x04, 0x4c, 0x15,
1962 0x49, 0x81, 0x94, 0xf5, 0x6e, 0x80, 0x8e, 0xc8,
1963 0x65, 0xea, 0x48, 0xfa, 0x29, 0xc2, 0x59, 0xf1,
1964 0x36, 0xd6, 0x8d, 0xa4, 0xc5, 0xe0, 0x7d, 0xe5,
1965 0xa2, 0xcc, 0xc4, 0xd0, 0x1d, 0xd6, 0xe6, 0xcf,
1966 0x11, 0x6e, 0x59, 0x12, 0xbb, 0x14,
1967 },
1968 .hex = "044C15498194F56E"
1969 "808EC865EA48FA29"
1970 "C259F136D68DA4C5"
1971 "E07DE5A2CCC4D01D"
1972 "D6E6CF116E5912BB"
1973 "14",
1974 .oct_len = 41,
1975 .oct = {
1976 0x04, 0x4c, 0x15, 0x49, 0x81, 0x94, 0xf5, 0x6e,
1977 0x80, 0x8e, 0xc8, 0x65, 0xea, 0x48, 0xfa, 0x29,
1978 0xc2, 0x59, 0xf1, 0x36, 0xd6, 0x8d, 0xa4, 0xc5,
1979 0xe0, 0x7d, 0xe5, 0xa2, 0xcc, 0xc4, 0xd0, 0x1d,
1980 0xd6, 0xe6, 0xcf, 0x11, 0x6e, 0x59, 0x12, 0xbb,
1981 0x14,
1982 },
1983 },
1984 {
1985 .name = "brainpoolP160t1",
1986 .der_len = 86,
1987 .der = {
1988 0x30, 0x54, 0x02, 0x01, 0x01, 0x04, 0x14, 0x2a,
1989 0xa6, 0xfa, 0x75, 0x2b, 0xb4, 0xc9, 0x99, 0xbb,
1990 0x61, 0xeb, 0x15, 0xdc, 0xf3, 0xd1, 0x42, 0x63,
1991 0x30, 0x5d, 0x73, 0xa0, 0x0b, 0x06, 0x09, 0x2b,
1992 0x24, 0x03, 0x03, 0x02, 0x08, 0x01, 0x01, 0x02,
1993 0xa1, 0x2c, 0x03, 0x2a, 0x00, 0x04, 0x96, 0x4b,
1994 0x2c, 0x8a, 0xed, 0x9b, 0x18, 0x30, 0xc1, 0x1c,
1995 0xbc, 0x16, 0x56, 0x7b, 0xc0, 0x3a, 0x6c, 0x52,
1996 0xf8, 0x71, 0xdf, 0x54, 0x20, 0x96, 0xe3, 0xe9,
1997 0xcf, 0x8f, 0x31, 0xb1, 0x69, 0x99, 0xc6, 0x11,
1998 0x80, 0x0d, 0x40, 0x25, 0xf0, 0x90,
1999 },
2000 .hex = "04964B2C8AED9B18"
2001 "30C11CBC16567BC0"
2002 "3A6C52F871DF5420"
2003 "96E3E9CF8F31B169"
2004 "99C611800D4025F0"
2005 "90",
2006 .oct_len = 41,
2007 .oct = {
2008 0x04, 0x96, 0x4b, 0x2c, 0x8a, 0xed, 0x9b, 0x18,
2009 0x30, 0xc1, 0x1c, 0xbc, 0x16, 0x56, 0x7b, 0xc0,
2010 0x3a, 0x6c, 0x52, 0xf8, 0x71, 0xdf, 0x54, 0x20,
2011 0x96, 0xe3, 0xe9, 0xcf, 0x8f, 0x31, 0xb1, 0x69,
2012 0x99, 0xc6, 0x11, 0x80, 0x0d, 0x40, 0x25, 0xf0,
2013 0x90,
2014 },
2015 },
2016 {
2017 .name = "brainpoolP192r1",
2018 .der_len = 98,
2019 .der = {
2020 0x30, 0x60, 0x02, 0x01, 0x01, 0x04, 0x18, 0x7c,
2021 0x05, 0x09, 0x95, 0xaf, 0x22, 0x1f, 0xc0, 0x0d,
2022 0xfe, 0x6d, 0x44, 0xf2, 0x87, 0x0c, 0x7d, 0x0e,
2023 0xed, 0x17, 0x46, 0xe1, 0x7d, 0xe3, 0x16, 0xa0,
2024 0x0b, 0x06, 0x09, 0x2b, 0x24, 0x03, 0x03, 0x02,
2025 0x08, 0x01, 0x01, 0x03, 0xa1, 0x34, 0x03, 0x32,
2026 0x00, 0x04, 0x71, 0x60, 0x9c, 0x62, 0x98, 0x76,
2027 0xc9, 0x14, 0x91, 0x75, 0xc6, 0xc8, 0x16, 0x32,
2028 0xc2, 0x29, 0x47, 0x64, 0xa3, 0x59, 0xa7, 0x45,
2029 0xdb, 0xd7, 0x51, 0x95, 0xba, 0xa4, 0x33, 0x46,
2030 0x6e, 0x4f, 0x86, 0xed, 0x1e, 0xea, 0xf6, 0xf1,
2031 0x3c, 0xf1, 0x96, 0x94, 0x1f, 0x9c, 0x04, 0x2a,
2032 0x43, 0x27,
2033 },
2034 .hex = "0471609C629876C9"
2035 "149175C6C81632C2"
2036 "294764A359A745DB"
2037 "D75195BAA433466E"
2038 "4F86ED1EEAF6F13C"
2039 "F196941F9C042A43"
2040 "27",
2041 .oct_len = 49,
2042 .oct = {
2043 0x04, 0x71, 0x60, 0x9c, 0x62, 0x98, 0x76, 0xc9,
2044 0x14, 0x91, 0x75, 0xc6, 0xc8, 0x16, 0x32, 0xc2,
2045 0x29, 0x47, 0x64, 0xa3, 0x59, 0xa7, 0x45, 0xdb,
2046 0xd7, 0x51, 0x95, 0xba, 0xa4, 0x33, 0x46, 0x6e,
2047 0x4f, 0x86, 0xed, 0x1e, 0xea, 0xf6, 0xf1, 0x3c,
2048 0xf1, 0x96, 0x94, 0x1f, 0x9c, 0x04, 0x2a, 0x43,
2049 0x27,
2050 },
2051 },
2052 {
2053 .name = "brainpoolP192t1",
2054 .der_len = 98,
2055 .der = {
2056 0x30, 0x60, 0x02, 0x01, 0x01, 0x04, 0x18, 0xbb,
2057 0x53, 0xd5, 0x6c, 0x01, 0x1f, 0x0f, 0x25, 0xfd,
2058 0x1d, 0x92, 0xc5, 0x60, 0xb2, 0x64, 0xe0, 0x32,
2059 0x0f, 0x69, 0x36, 0xcb, 0x16, 0x3e, 0x37, 0xa0,
2060 0x0b, 0x06, 0x09, 0x2b, 0x24, 0x03, 0x03, 0x02,
2061 0x08, 0x01, 0x01, 0x04, 0xa1, 0x34, 0x03, 0x32,
2062 0x00, 0x04, 0x8d, 0x2b, 0x0c, 0xee, 0xea, 0x4b,
2063 0x63, 0xaf, 0x63, 0x36, 0xb2, 0x3a, 0x55, 0x40,
2064 0x85, 0x33, 0x95, 0xc1, 0x1d, 0x37, 0xd3, 0xfc,
2065 0x5c, 0x25, 0x8a, 0x0a, 0xc5, 0xec, 0x7f, 0xe0,
2066 0x7f, 0x08, 0x5e, 0xdf, 0x89, 0xe6, 0xee, 0x21,
2067 0x6d, 0x1b, 0x15, 0xd7, 0x4b, 0x79, 0xc1, 0xb5,
2068 0x28, 0xc7,
2069 },
2070 .hex = "048D2B0CEEEA4B63"
2071 "AF6336B23A554085"
2072 "3395C11D37D3FC5C"
2073 "258A0AC5EC7FE07F"
2074 "085EDF89E6EE216D"
2075 "1B15D74B79C1B528"
2076 "C7",
2077 .oct_len = 49,
2078 .oct = {
2079 0x04, 0x8d, 0x2b, 0x0c, 0xee, 0xea, 0x4b, 0x63,
2080 0xaf, 0x63, 0x36, 0xb2, 0x3a, 0x55, 0x40, 0x85,
2081 0x33, 0x95, 0xc1, 0x1d, 0x37, 0xd3, 0xfc, 0x5c,
2082 0x25, 0x8a, 0x0a, 0xc5, 0xec, 0x7f, 0xe0, 0x7f,
2083 0x08, 0x5e, 0xdf, 0x89, 0xe6, 0xee, 0x21, 0x6d,
2084 0x1b, 0x15, 0xd7, 0x4b, 0x79, 0xc1, 0xb5, 0x28,
2085 0xc7,
2086 },
2087 },
2088#endif /* ENABLE_SMALL_CURVES */
2089 { 1448 {
2090 .name = "brainpoolP224r1", 1449 .name = "brainpoolP224r1",
2091 .der_len = 110, 1450 .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 @@
1/* $OpenBSD: ecc_cdh.c,v 1.3 2024/11/24 10:13:16 tb Exp $ */ 1/* $OpenBSD: ecc_cdh.c,v 1.4 2024/12/24 18:32:31 tb Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
@@ -40,234 +40,6 @@ static const struct ecc_cdh_test {
40 const char *pub_y; 40 const char *pub_y;
41 const char *want; 41 const char *want;
42} ecc_cdh_tests[] = { 42} ecc_cdh_tests[] = {
43#ifdef ENABLE_SMALL_CURVES
44 {
45 .nid = NID_X9_62_prime192v1,
46 .peer_x = "42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0",
47 .peer_y = "dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523",
48 .priv = "f17d3fea367b74d340851ca4270dcb24c271f445bed9d527",
49 .pub_x = "b15053401f57285637ec324c1cd2139e3a67de3739234b37",
50 .pub_y = "f269c158637482aad644cd692dd1d3ef2c8a7c49e389f7f6",
51 .want = "803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0",
52 },
53 {
54 .nid = NID_X9_62_prime192v1,
55 .peer_x = "deb5712fa027ac8d2f22c455ccb73a91e17b6512b5e030e7",
56 .peer_y = "7e2690a02cc9b28708431a29fb54b87b1f0c14e011ac2125",
57 .priv = "56e853349d96fe4c442448dacb7cf92bb7a95dcf574a9bd5",
58 .pub_x = "c00d435716ffea53fd8c162792414c37665187e582716539",
59 .pub_y = "ab711c62aa71a5a18e8a3c48f89dc6fa52fac0108e52a8a0",
60 .want = "c208847568b98835d7312cef1f97f7aa298283152313c29d",
61 },
62 {
63 .nid = NID_X9_62_prime192v1,
64 .peer_x = "4edaa8efc5a0f40f843663ec5815e7762dddc008e663c20f",
65 .peer_y = "0a9f8dc67a3e60ef6d64b522185d03df1fc0adfd42478279",
66 .priv = "c6ef61fe12e80bf56f2d3f7d0bb757394519906d55500949",
67 .pub_x = "e184bc182482f3403c8787b83842477467fcd011db0f6c64",
68 .pub_y = "f9d1c14142f40de8639db97d51a63d2cce1007ccf773cdcb",
69 .want = "87229107047a3b611920d6e3b2c0c89bea4f49412260b8dd",
70 },
71 {
72 .nid = NID_X9_62_prime192v1,
73 .peer_x = "8887c276edeed3e9e866b46d58d895c73fbd80b63e382e88",
74 .peer_y = "04c5097ba6645e16206cfb70f7052655947dd44a17f1f9d5",
75 .priv = "e6747b9c23ba7044f38ff7e62c35e4038920f5a0163d3cda",
76 .pub_x = "2b838dbe73735f37a39a78d3195783d26991e86ff4d92d1a",
77 .pub_y = "60d344942274489f98903b2e7f93f8d197fc9ae60a0ed53a",
78 .want = "eec0bed8fc55e1feddc82158fd6dc0d48a4d796aaf47d46c",
79 },
80 {
81 .nid = NID_X9_62_prime192v1,
82 .peer_x = "0d045f30254adc1fcefa8a5b1f31bf4e739dd327cd18d594",
83 .peer_y = "542c314e41427c08278a08ce8d7305f3b5b849c72d8aff73",
84 .priv = "beabedd0154a1afcfc85d52181c10f5eb47adc51f655047d",
85 .pub_x = "1f65cf6e8978e1c1bc10bb61a7db311de310088c8cf9768b",
86 .pub_y = "f7d438168e7f42ab14b16af53a7a2f646ff40b53d74cbcc7",
87 .want = "716e743b1b37a2cd8479f0a3d5a74c10ba2599be18d7e2f4",
88 },
89 {
90 .nid = NID_X9_62_prime192v1,
91 .peer_x = "fb35ca20d2e96665c51b98e8f6eb3d79113508d8bccd4516",
92 .peer_y = "368eec0d5bfb847721df6aaff0e5d48c444f74bf9cd8a5a7",
93 .priv = "cf70354226667321d6e2baf40999e2fd74c7a0f793fa8699",
94 .pub_x = "5f4844ffcce61005d24f737db98675e92f7b6543aeb6106c",
95 .pub_y = "5424f598139215d389b6b12b86d58014857f2ddadb540f51",
96 .want = "f67053b934459985a315cb017bf0302891798d45d0e19508",
97 },
98 {
99 .nid = NID_X9_62_prime192v1,
100 .peer_x = "824752960c1307e5f13a83da21c7998ca8b5b00b9549f6d0",
101 .peer_y = "bc52d91e234363bc32ee0b6778f25cd8c1847510f4348b94",
102 .priv = "fe942515237fffdd7b4eb5c64909eee4856a076cdf12bae2",
103 .pub_x = "e6369df79b207b8b8679f7c869cfc264859d1ab55aa401e8",
104 .pub_y = "1f99c71f801a30b52f74da6e5e6dbb62ee4c5da1090cc020",
105 .want = "75822971193edd472bf30151a782619c55ad0b279c9303dd",
106 },
107 {
108 .nid = NID_X9_62_prime192v1,
109 .peer_x = "10bb57020291141981f833b4749e5611034b308e84011d21",
110 .peer_y = "e1cacd6b7bd17ed8ddb50b6aee0654c35f2d0eddc1cffcf6",
111 .priv = "33fed10492afa5bea0333c0af12cac940c4d222455bcd0fe",
112 .pub_x = "ef0b28afc41637d737f42e4c8aaceadc84ba2e0b849ca18c",
113 .pub_y = "57797942e552173bba17f73278e029f42335068bd770ddf2",
114 .want = "67cba2cbb69ee78bf1abafb0e6fbe33fa2094c128d59652d",
115 },
116 {
117 .nid = NID_X9_62_prime192v1,
118 .peer_x = "5192fce4185a7758ea1bc56e0e4f4e8b2dce32348d0dced1",
119 .peer_y = "20989981beaaf0006d88a96e7971a2fa3a33ba46047fc7ba",
120 .priv = "f3557c5d70b4c7954960c33568776adbe8e43619abe26b13",
121 .pub_x = "d70112c5f0f0844386494ac1ad99dce2214134176ebfb9af",
122 .pub_y = "d3c187a038510ab31d459e2b7af1a380dd7576af06267548",
123 .want = "cf99a2770a386ca0137d1eca0a226e484297ac3c513f3631",
124 },
125 {
126 .nid = NID_X9_62_prime192v1,
127 .peer_x = "26d019dbe279ead01eed143a91601ada26e2f42225b1c62b",
128 .peer_y = "6ca653f08272e0386fc9421fbd580093d7ae6301bca94476",
129 .priv = "586cfba1c6e81766ed52828f177b1be14ebbc5b83348c311",
130 .pub_x = "58b3c63e56bec9d696bf9a88df2873738391f76368aa2b49",
131 .pub_y = "5776773b261faf7ba2fdc4fe43b92c0b1c7a2fd054a43650",
132 .want = "576331e2b4fb38a112810e1529834de8307fb0a0d2756877",
133 },
134 {
135 .nid = NID_X9_62_prime192v1,
136 .peer_x = "539bc40fe20a0fb267888b647b03eaaf6ec20c02a1e1f8c8",
137 .peer_y = "69095e5bb7b4d44c3278a7ee6beca397c45246da9a34c8be",
138 .priv = "cad8100603a4f65be08d8fc8a1b7e884c5ff65deb3c96d99",
139 .pub_x = "b7fcc0f52c7a411edbed39e10bf02b6ae0f26614c6b325a2",
140 .pub_y = "47483b26eb67776de2b93ab7119d5447573739e3d55e72fb",
141 .want = "902f4501916a0dd945554c3a37b3d780d375a6da713197c4",
142 },
143 {
144 .nid = NID_X9_62_prime192v1,
145 .peer_x = "5d343ddb96318fb4794d10f6c573f99fee5d0d57b996250f",
146 .peer_y = "99fbdf9d97dd88ad410235dac36e5b92ce2824b8e587a82c",
147 .priv = "1edd879cc5c79619cae6c73a691bd5a0395c0ef3b356fcd2",
148 .pub_x = "6ce6adb2c30808f590048c33dffad4524ebf7a5fd39b747b",
149 .pub_y = "4966bd2f3d00569b4d4c0409fbd7a2db752f6d09bca8c25f",
150 .want = "46e4de335054d429863218ae33636fc9b89c628b64b506c7",
151 },
152 {
153 .nid = NID_X9_62_prime192v1,
154 .peer_x = "8d3db9bdce137ffbfb891388c37df6c0cbc90aa5e5376220",
155 .peer_y = "135d30b5cb660eef8764ffc744f15c1b5d6dc06ba4416d37",
156 .priv = "460e452273fe1827602187ad3bebee65cb84423bb4f47537",
157 .pub_x = "d1bd3a3efabf4767fe6380bdf0dbf49d52d4cf0cbb89404c",
158 .pub_y = "c150c2b4c8b3aa35f765f847e4f7f8fd8704d241a181ee99",
159 .want = "1bfe9e5a20ac7a38d8f605b425bb9030be31ef97c101c76c",
160 },
161 {
162 .nid = NID_X9_62_prime192v1,
163 .peer_x = "9e0a6949519c7f5be68c0433c5fdf13064aa13fb29483dc3",
164 .peer_y = "e1c8ba63e1f471db23185f50d9c871edea21255b3a63b4b7",
165 .priv = "b970365008456f8758ecc5a3b33cf3ae6a8d568107a52167",
166 .pub_x = "c1b8610c8c63f8d4abda093b9a11a566044bf65c6faa8999",
167 .pub_y = "a5bc4b3ca095382e9738aee95fe9479b17879b3ad5295559",
168 .want = "0e8c493a4adc445dc9288a3b9b272599224054592d7265b3",
169 },
170 {
171 .nid = NID_X9_62_prime192v1,
172 .peer_x = "be088238902e9939b3d054eeeb8492daf4bdcf09a2ab77f1",
173 .peer_y = "58d6749a3a923dc80440f2661fd35b651617e65294b46375",
174 .priv = "59c15b8a2464e41dfe4371c7f7dadf470ae425544f8113bd",
175 .pub_x = "1fe776f73567b6ac0b0d6764164de6c5be751ba8d1ff455e",
176 .pub_y = "4c160bf38afb2b71f684261664115ce874553e8b059432d2",
177 .want = "0f1991086b455ded6a1c4146f7bf59fe9b495de566ebc6bf",
178 },
179 {
180 .nid = NID_X9_62_prime192v1,
181 .peer_x = "bf5ae05025e1be617e666d87a4168363873d5761b376b503",
182 .peer_y = "e1e6e38b372b6bee0ff5b3502d83735e3b2c26825e4f0fcc",
183 .priv = "a6e9b885c66b959d1fc2708d591b6d3228e49eb98f726d61",
184 .pub_x = "632bb7651dbf49dde9dd125d13fb234e06617723beed3d1b",
185 .pub_y = "f4ad5209638488397c5f44f994dd7479807e79f4887d2e71",
186 .want = "b30f2127c34df35aaa91dbf0bbe15798e799a03ed11698c1",
187 },
188 {
189 .nid = NID_X9_62_prime192v1,
190 .peer_x = "6cc4feed84c7ab0d09005d660ed34de6955a9461c4138d11",
191 .peer_y = "31225f33864ed48da06fa45a913b46cf42557742e35085e6",
192 .priv = "bdb754096ffbfbd8b0f3cb046ccb7ca149c4e7192067a3ee",
193 .pub_x = "d9c098d421d741f6faab116f3e4731d28c5558e19fe112a1",
194 .pub_y = "38d4dc48ccdb1d3ed8d31fd06784a4f87a68aec1cbd5b08f",
195 .want = "64a5c246599d3e8177a2402a1110eb81e6c456ab4edb5127",
196 },
197 {
198 .nid = NID_X9_62_prime192v1,
199 .peer_x = "36157315bee7afedded58c4e8ba14d3421c401e51135bcc9",
200 .peer_y = "37c297ca703f77c52bb062d8ce971db84097ba0c753a418f",
201 .priv = "d5bcf2534dafc3d99964c7bd63ab7bd15999fe56dd969c42",
202 .pub_x = "fda1d5d28d6fe0e7909d6a8bafa7824db5572ab92ffe7de6",
203 .pub_y = "134a297c1d9c8bbab249abacd951ed11e5a99f92e7991572",
204 .want = "017b8ca53c82fab163da2ab783966a39e061b32c8cfa334d",
205 },
206 {
207 .nid = NID_X9_62_prime192v1,
208 .peer_x = "98464d47f0256f8292e027e8c92582ea77cf9051f5ce8e5d",
209 .peer_y = "449552ef7578be96236fe5ed9d0643c0bb6c5a9134b0108d",
210 .priv = "43d4b9df1053be5b4268104c02244d3bf9594b010b46a8b2",
211 .pub_x = "c3020b7091463d788f1f1d76f7cfeec82ecdb3b7d99c345c",
212 .pub_y = "9a7710d5179591d8f3df0aa122301768ae7db7eee2d7f583",
213 .want = "340ef3db3dbebdd91c62c3d4e1a3da2c7c52a3338b865259",
214 },
215 {
216 .nid = NID_X9_62_prime192v1,
217 .peer_x = "563eb66c334cf6f123bf04c7803b48a3110214237e983bf5",
218 .peer_y = "0f351104819199ef07c9a6051d20758f3af79027ea66a53f",
219 .priv = "94cac2c2ca714746401670d94edbf3f677867b5a03bee7ad",
220 .pub_x = "b18554a2e743ef0aa2f040987c4c451004e096df3d80ddae",
221 .pub_y = "6e3e2c618f896e36ba620077684b70a05ffb79bf5e6c7640",
222 .want = "2162144921df5103d0e6a650fb13fd246f4738d0896ce92f",
223 },
224 {
225 .nid = NID_X9_62_prime192v1,
226 .peer_x = "86828c4ac92b5507618aec7873a1d4fc6543c5be33cf3078",
227 .peer_y = "b22ca72437545e10d6d4f052422eb898b737a4b8543ee550",
228 .priv = "2a3a9e33c8cc3107a9f9265c3bdea1206570e86f92ac7014",
229 .pub_x = "a7ba38be1bc669dd23ccfcee0645b1f0db8cf942deafaeb6",
230 .pub_y = "b82db79d80cd0e37f28d4163adc389dee8fc7797b5c9831b",
231 .want = "4c69e7feed4b11159adfc16a6047a92572ea44e0740b23af",
232 },
233 {
234 .nid = NID_X9_62_prime192v1,
235 .peer_x = "6700a102437781a9581da2bc25ced5abf419da91d3c803df",
236 .peer_y = "71396c9cf08bcd91854e3e6e42d8c657ce0f27ab77a9dc4b",
237 .priv = "4a6b78a98ac98fa8e99a8ece08ec0251125f85c6fd0e289b",
238 .pub_x = "e769dbbcd5ce2d83514b768d3d2d5aa0bcd8f66af15f5500",
239 .pub_y = "2fc6d0b039e0f28f74fbeffe9e883d4dd72296e4e95cae71",
240 .want = "46072acefd67bff50de355ca7a31fa6be59f26e467587259",
241 },
242 {
243 .nid = NID_X9_62_prime192v1,
244 .peer_x = "a82f354cf97bee5d22dc6c079f2902ead44d96a8f614f178",
245 .peer_y = "a654a9aa8a1a0802f2ce0ee8a0f4ebe96dee1b37464b1ff2",
246 .priv = "c5a6491d78844d6617ef33be6b8bd54da221450885d5950f",
247 .pub_x = "db1b24f7466bc154e9d7d2c3ca52dcfe0bfc9563c5fdb6f3",
248 .pub_y = "1c74fbbf5bd99921f1a9a744f8e1cf770bd6a76a772b3003",
249 .want = "ec5580eabca9f3389d2b427ddf6e49e26d629afd03fa766e",
250 },
251 {
252 .nid = NID_X9_62_prime192v1,
253 .peer_x = "3cec21b28668a12a2cf78e1a8e55d0efe065152fffc34718",
254 .peer_y = "1029557beba4ff1992bd21c23cb4825f6dae70e3318fd1ca",
255 .priv = "2ba2703c5e23f6463c5b88dc37292fabd3399b5e1fb67c05",
256 .pub_x = "7543148906cef9b37a71a7c08363cdd3bba50142d65241aa",
257 .pub_y = "8b3a6973de8dc271e27c1ead1e962fdaae3710c724daac38",
258 .want = "7f3929dd3cbf7673bc30d859d90b880307475f800660ea32",
259 },
260 {
261 .nid = NID_X9_62_prime192v1,
262 .peer_x = "7082644715b8b731f8228b5118e7270d34d181f361a221fc",
263 .peer_y = "464649d6c88ca89614488a1cc7b8442bb42f9fb3020a3d76",
264 .priv = "836118c6248f882e9147976f764826c1a28755a6102977d5",
265 .pub_x = "fcd345a976c720caaa97de6697226825615e1287a9eff67e",
266 .pub_y = "58ea42edbeeafca9ff44cfd7f29abd2cbde7626d79e422c9",
267 .want = "72e88f3ea67d46d46dbf83926e7e2a6b85b54536741e6d2c",
268 },
269#endif /* ENABLE_SMALL_CURVES */
270
271 { 43 {
272 .nid = NID_secp224r1, 44 .nid = NID_secp224r1,
273 .peer_x = 45 .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 @@
1/* $OpenBSD: ecdhtest.c,v 1.21 2024/11/24 10:13:16 tb Exp $ */ 1/* $OpenBSD: ecdhtest.c,v 1.22 2024/12/24 18:32:31 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -174,14 +174,6 @@ static const struct ecdh_kat_test {
174 const char *want; 174 const char *want;
175} ecdh_kat_tests[] = { 175} ecdh_kat_tests[] = {
176 /* Keys and shared secrets from RFC 5114 */ 176 /* Keys and shared secrets from RFC 5114 */
177#ifdef ENABLE_SMALL_CURVES
178 {
179 .nid = NID_X9_62_prime192v1,
180 .keya = "323fa3169d8e9c6593f59476bc142000ab5be0e249c43426",
181 .keyb = "631f95bb4a67632c9c476eee9ab695ab240a0499307fcf62",
182 .want = "ad420182633f8526bfe954acda376f05e5ff4f837f54febe",
183 },
184#endif
185 { 177 {
186 .nid = NID_secp224r1, 178 .nid = NID_secp224r1,
187 .keya = "b558eb6c288da707bbb4f8fbae2ab9e9cb62e3bc5c7573e2" 179 .keya = "b558eb6c288da707bbb4f8fbae2ab9e9cb62e3bc5c7573e2"