From fe8b80dbfd7a71d866da84cfdab5d2ce23feac28 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 24 Dec 2024 18:33:24 +0000
Subject: Remove disabled code supporting elliptic curves of small order

ok jsing
---
 src/lib/libcrypto/ec/ec_curve.c | 1015 +--------------------------------------
 1 file changed, 1 insertion(+), 1014 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c
index cc5ad4d4e6..cbe113e361 100644
--- a/src/lib/libcrypto/ec/ec_curve.c
+++ b/src/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.52 2024/12/06 04:35:03 tb Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.53 2024/12/24 18:33:24 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -83,56 +83,6 @@
 
 #include "ec_local.h"
 
-#ifdef ENABLE_SMALL_CURVES
-
-/* the nist prime curves */
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_NIST_PRIME_192 = {
-	.seed = {
-		0x30, 0x45, 0xae, 0x6f, 0xc8, 0x42, 0x2f, 0x64, 0xed, 0x57,
-		0x95, 0x28, 0xd3, 0x81, 0x20, 0xea, 0xe1, 0x21, 0x96, 0xd5,
-	},
-	.p = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-	},
-	.a = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xfc,
-	},
-	.b = {
-		0x64, 0x21, 0x05, 0x19, 0xe5, 0x9c, 0x80, 0xe7, 0x0f, 0xa7,
-		0xe9, 0xab, 0x72, 0x24, 0x30, 0x49, 0xfe, 0xb8, 0xde, 0xec,
-		0xc1, 0x46, 0xb9, 0xb1,
-	},
-	.x = {
-		0x18, 0x8d, 0xa8, 0x0e, 0xb0, 0x30, 0x90, 0xf6, 0x7c, 0xbf,
-		0x20, 0xeb, 0x43, 0xa1, 0x88, 0x00, 0xf4, 0xff, 0x0a, 0xfd,
-		0x82, 0xff, 0x10, 0x12,
-	},
-	.y = {
-		0x07, 0x19, 0x2b, 0x95, 0xff, 0xc8, 0xda, 0x78, 0x63, 0x10,
-		0x11, 0xed, 0x6b, 0x24, 0xcd, 0xd5, 0x73, 0xf9, 0x77, 0xa1,
-		0x1e, 0x79, 0x48, 0x11,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0x99, 0xde, 0xf8, 0x36, 0x14, 0x6b, 0xc9, 0xb1,
-		0xb4, 0xd2, 0x28, 0x31,
-	},
-};
-
-#endif /* ENABLE_SMALL_CURVES */
-
 static const struct {
 	uint8_t seed[20];
 	uint8_t p[28];
@@ -304,101 +254,6 @@ static const struct {
 	},
 };
 
-#ifdef ENABLE_SMALL_CURVES
-
-/* the x9.62 prime curves (minus the nist prime curves) */
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_X9_62_PRIME_192V2 = {
-	.seed = {
-		0x31, 0xa9, 0x2e, 0xe2, 0x02, 0x9f, 0xd1, 0x0d, 0x90, 0x1b,
-		0x11, 0x3e, 0x99, 0x07, 0x10, 0xf0, 0xd2, 0x1a, 0xc6, 0xb6,
-	},
-	.p = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-	},
-	.a = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xfc,
-	},
-	.b = {
-		0xcc, 0x22, 0xd6, 0xdf, 0xb9, 0x5c, 0x6b, 0x25, 0xe4, 0x9c,
-		0x0d, 0x63, 0x64, 0xa4, 0xe5, 0x98, 0x0c, 0x39, 0x3a, 0xa2,
-		0x16, 0x68, 0xd9, 0x53,
-	},
-	.x = {
-		0xee, 0xa2, 0xba, 0xe7, 0xe1, 0x49, 0x78, 0x42, 0xf2, 0xde,
-		0x77, 0x69, 0xcf, 0xe9, 0xc9, 0x89, 0xc0, 0x72, 0xad, 0x69,
-		0x6f, 0x48, 0x03, 0x4a,
-	},
-	.y = {
-		0x65, 0x74, 0xd1, 0x1d, 0x69, 0xb6, 0xec, 0x7a, 0x67, 0x2b,
-		0xb8, 0x2a, 0x08, 0x3d, 0xf2, 0xf2, 0xb0, 0x84, 0x7d, 0xe9,
-		0x70, 0xb2, 0xde, 0x15,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xfe, 0x5f, 0xb1, 0xa7, 0x24, 0xdc, 0x80, 0x41, 0x86,
-		0x48, 0xd8, 0xdd, 0x31,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_X9_62_PRIME_192V3 = {
-	.seed = {
-		0xc4, 0x69, 0x68, 0x44, 0x35, 0xde, 0xb3, 0x78, 0xc4, 0xb6,
-		0x5c, 0xa9, 0x59, 0x1e, 0x2a, 0x57, 0x63, 0x05, 0x9a, 0x2e,
-	},
-	.p = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-	},
-	.a = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xfc,
-	},
-	.b = {
-		0x22, 0x12, 0x3d, 0xc2, 0x39, 0x5a, 0x05, 0xca, 0xa7, 0x42,
-		0x3d, 0xae, 0xcc, 0xc9, 0x47, 0x60, 0xa7, 0xd4, 0x62, 0x25,
-		0x6b, 0xd5, 0x69, 0x16,
-	},
-	.x = {
-		0x7d, 0x29, 0x77, 0x81, 0x00, 0xc6, 0x5a, 0x1d, 0xa1, 0x78,
-		0x37, 0x16, 0x58, 0x8d, 0xce, 0x2b, 0x8b, 0x4a, 0xee, 0x8e,
-		0x22, 0x8f, 0x18, 0x96,
-	},
-	.y = {
-		0x38, 0xa9, 0x0f, 0x22, 0x63, 0x73, 0x37, 0x33, 0x4b, 0x49,
-		0xdc, 0xb6, 0x6a, 0x6d, 0xc8, 0xf9, 0x97, 0x8a, 0xca, 0x76,
-		0x48, 0xa9, 0x43, 0xb0,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0x7a, 0x62, 0xd0, 0x31, 0xc8, 0x3f, 0x42, 0x94,
-		0xf6, 0x40, 0xec, 0x13,
-	},
-};
-
-#endif /* ENABLE_SMALL_CURVES */
-
 static const struct {
 	uint8_t seed[20];
 	uint8_t p[30];
@@ -585,337 +440,6 @@ static const struct {
 	},
 };
 
-#ifdef ENABLE_SMALL_CURVES
-
-/* the secg prime curves (minus the nist and x9.62 prime curves) */
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[14];
-	uint8_t a[14];
-	uint8_t b[14];
-	uint8_t x[14];
-	uint8_t y[14];
-	uint8_t order[14];
-} _EC_SECG_PRIME_112R1 = {
-	.seed = {
-		0x00, 0xf5, 0x0b, 0x02, 0x8e, 0x4d, 0x69, 0x6e, 0x67, 0x68,
-		0x75, 0x61, 0x51, 0x75, 0x29, 0x04, 0x72, 0x78, 0x3f, 0xb1,
-	},
-	.p = {
-		0xdb, 0x7c, 0x2a, 0xbf, 0x62, 0xe3, 0x5e, 0x66, 0x80, 0x76,
-		0xbe, 0xad, 0x20, 0x8b,
-	},
-	.a = {
-		0xdb, 0x7c, 0x2a, 0xbf, 0x62, 0xe3, 0x5e, 0x66, 0x80, 0x76,
-		0xbe, 0xad, 0x20, 0x88,
-	},
-	.b = {
-		0x65, 0x9e, 0xf8, 0xba, 0x04, 0x39, 0x16, 0xee, 0xde, 0x89,
-		0x11, 0x70, 0x2b, 0x22,
-	},
-	.x = {
-		0x09, 0x48, 0x72, 0x39, 0x99, 0x5a, 0x5e, 0xe7, 0x6b, 0x55,
-		0xf9, 0xc2, 0xf0, 0x98,
-	},
-	.y = {
-		0xa8, 0x9c, 0xe5, 0xaf, 0x87, 0x24, 0xc0, 0xa2, 0x3e, 0x0e,
-		0x0f, 0xf7, 0x75, 0x00,
-	},
-	.order = {
-		0xdb, 0x7c, 0x2a, 0xbf, 0x62, 0xe3, 0x5e, 0x76, 0x28, 0xdf,
-		0xac, 0x65, 0x61, 0xc5,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[14];
-	uint8_t a[14];
-	uint8_t b[14];
-	uint8_t x[14];
-	uint8_t y[14];
-	uint8_t order[14];
-} _EC_SECG_PRIME_112R2 = {
-	.seed = {
-		0x00, 0x27, 0x57, 0xa1, 0x11, 0x4d, 0x69, 0x6e, 0x67, 0x68,
-		0x75, 0x61, 0x51, 0x75, 0x53, 0x16, 0xc0, 0x5e, 0x0b, 0xd4,
-	},
-	.p = {
-		0xdb, 0x7c, 0x2a, 0xbf, 0x62, 0xe3, 0x5e, 0x66, 0x80, 0x76,
-		0xbe, 0xad, 0x20, 0x8b,
-	},
-	.a = {
-		0x61, 0x27, 0xc2, 0x4c, 0x05, 0xf3, 0x8a, 0x0a, 0xaa, 0xf6,
-		0x5c, 0x0e, 0xf0, 0x2c,
-	},
-	.b = {
-		0x51, 0xde, 0xf1, 0x81, 0x5d, 0xb5, 0xed, 0x74, 0xfc, 0xc3,
-		0x4c, 0x85, 0xd7, 0x09,
-	},
-	.x = {
-		0x4b, 0xa3, 0x0a, 0xb5, 0xe8, 0x92, 0xb4, 0xe1, 0x64, 0x9d,
-		0xd0, 0x92, 0x86, 0x43,
-	},
-	.y = {
-		0xad, 0xcd, 0x46, 0xf5, 0x88, 0x2e, 0x37, 0x47, 0xde, 0xf3,
-		0x6e, 0x95, 0x6e, 0x97,
-	},
-	.order = {
-		0x36, 0xdf, 0x0a, 0xaf, 0xd8, 0xb8, 0xd7, 0x59, 0x7c, 0xa1,
-		0x05, 0x20, 0xd0, 0x4b,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[16];
-	uint8_t a[16];
-	uint8_t b[16];
-	uint8_t x[16];
-	uint8_t y[16];
-	uint8_t order[16];
-} _EC_SECG_PRIME_128R1 = {
-	.seed = {
-		0x00, 0x0e, 0x0d, 0x4d, 0x69, 0x6e, 0x67, 0x68, 0x75, 0x61,
-		0x51, 0x75, 0x0c, 0xc0, 0x3a, 0x44, 0x73, 0xd0, 0x36, 0x79,
-	},
-	.p = {
-		0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	},
-	.a = {
-		0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-	},
-	.b = {
-		0xe8, 0x75, 0x79, 0xc1, 0x10, 0x79, 0xf4, 0x3d, 0xd8, 0x24,
-		0x99, 0x3c, 0x2c, 0xee, 0x5e, 0xd3,
-	},
-	.x = {
-		0x16, 0x1f, 0xf7, 0x52, 0x8b, 0x89, 0x9b, 0x2d, 0x0c, 0x28,
-		0x60, 0x7c, 0xa5, 0x2c, 0x5b, 0x86,
-	},
-	.y = {
-		0xcf, 0x5a, 0xc8, 0x39, 0x5b, 0xaf, 0xeb, 0x13, 0xc0, 0x2d,
-		0xa2, 0x92, 0xdd, 0xed, 0x7a, 0x83,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x75, 0xa3,
-		0x0d, 0x1b, 0x90, 0x38, 0xa1, 0x15,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[16];
-	uint8_t a[16];
-	uint8_t b[16];
-	uint8_t x[16];
-	uint8_t y[16];
-	uint8_t order[16];
-} _EC_SECG_PRIME_128R2 = {
-	.seed = {
-		0x00, 0x4d, 0x69, 0x6e, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
-		0x12, 0xd8, 0xf0, 0x34, 0x31, 0xfc, 0xe6, 0x3b, 0x88, 0xf4,
-	},
-	.p = {
-		0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	},
-	.a = {
-		0xd6, 0x03, 0x19, 0x98, 0xd1, 0xb3, 0xbb, 0xfe, 0xbf, 0x59,
-		0xcc, 0x9b, 0xbf, 0xf9, 0xae, 0xe1,
-	},
-	.b = {
-		0x5e, 0xee, 0xfc, 0xa3, 0x80, 0xd0, 0x29, 0x19, 0xdc, 0x2c,
-		0x65, 0x58, 0xbb, 0x6d, 0x8a, 0x5d,
-	},
-	.x = {
-		0x7b, 0x6a, 0xa5, 0xd8, 0x5e, 0x57, 0x29, 0x83, 0xe6, 0xfb,
-		0x32, 0xa7, 0xcd, 0xeb, 0xc1, 0x40,
-	},
-	.y = {
-		0x27, 0xb6, 0x91, 0x6a, 0x89, 0x4d, 0x3a, 0xee, 0x71, 0x06,
-		0xfe, 0x80, 0x5f, 0xc3, 0x4b, 0x44,
-	},
-	.order = {
-		0x3f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xbe, 0x00,
-		0x24, 0x72, 0x06, 0x13, 0xb5, 0xa3,
-	},
-};
-
-static const struct {
-	uint8_t p[21];
-	uint8_t a[21];
-	uint8_t b[21];
-	uint8_t x[21];
-	uint8_t y[21];
-	uint8_t order[21];
-} _EC_SECG_PRIME_160K1 = {
-	.p = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xac,
-		0x73,
-	},
-	.a = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00,
-	},
-	.b  = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x07,
-	},
-	.x = {
-		0x00, 0x3b, 0x4c, 0x38, 0x2c, 0xe3, 0x7a, 0xa1, 0x92, 0xa4,
-		0x01, 0x9e, 0x76, 0x30, 0x36, 0xf4, 0xf5, 0xdd, 0x4d, 0x7e,
-		0xbb,
-	},
-	.y = {
-		0x00, 0x93, 0x8c, 0xf9, 0x35, 0x31, 0x8f, 0xdc, 0xed, 0x6b,
-		0xc2, 0x82, 0x86, 0x53, 0x17, 0x33, 0xc3, 0xf0, 0x3c, 0x4f,
-		0xee,
-	},
-	.order = {
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x01, 0xb8, 0xfa, 0x16, 0xdf, 0xab, 0x9a, 0xca, 0x16, 0xb6,
-		0xb3,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[21];
-	uint8_t a[21];
-	uint8_t b[21];
-	uint8_t x[21];
-	uint8_t y[21];
-	uint8_t order[21];
-} _EC_SECG_PRIME_160R1 = {
-	.seed = {
-		0x10, 0x53, 0xcd, 0xe4, 0x2c, 0x14, 0xd6, 0x96, 0xe6, 0x76,
-		0x87, 0x56, 0x15, 0x17, 0x53, 0x3b, 0xf3, 0xf8, 0x33, 0x45,
-	},
-	.p = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
-		0xff,
-	},
-	.a = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff,
-		0xfc,
-	},
-	.b = {
-		0x00, 0x1c, 0x97, 0xbe, 0xfc, 0x54, 0xbd, 0x7a, 0x8b, 0x65,
-		0xac, 0xf8, 0x9f, 0x81, 0xd4, 0xd4, 0xad, 0xc5, 0x65, 0xfa,
-		0x45,
-	},
-	.x = {
-		0x00, 0x4a, 0x96, 0xb5, 0x68, 0x8e, 0xf5, 0x73, 0x28, 0x46,
-		0x64, 0x69, 0x89, 0x68, 0xc3, 0x8b, 0xb9, 0x13, 0xcb, 0xfc,
-		0x82,
-	},
-	.y = {
-		0x00, 0x23, 0xa6, 0x28, 0x55, 0x31, 0x68, 0x94, 0x7d, 0x59,
-		0xdc, 0xc9, 0x12, 0x04, 0x23, 0x51, 0x37, 0x7a, 0xc5, 0xfb,
-		0x32,
-	},
-	.order = {
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x01, 0xf4, 0xc8, 0xf9, 0x27, 0xae, 0xd3, 0xca, 0x75, 0x22,
-		0x57,
-	},
-};
-
-static const struct {
-	uint8_t seed[20];
-	uint8_t p[21];
-	uint8_t a[21];
-	uint8_t b[21];
-	uint8_t x[21];
-	uint8_t y[21];
-	uint8_t order[21];
-} _EC_SECG_PRIME_160R2 = {
-	.seed = {
-		0xb9, 0x9b, 0x99, 0xb0, 0x99, 0xb3, 0x23, 0xe0, 0x27, 0x09,
-		0xa4, 0xd6, 0x96, 0xe6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x51,
-	},
-	.p = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xac,
-		0x73,
-	},
-	.a = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xac,
-		0x70,
-	},
-	.b = {
-		0x00, 0xb4, 0xe1, 0x34, 0xd3, 0xfb, 0x59, 0xeb, 0x8b, 0xab,
-		0x57, 0x27, 0x49, 0x04, 0x66, 0x4d, 0x5a, 0xf5, 0x03, 0x88,
-		0xba,
-	},
-	.x = {
-		0x00, 0x52, 0xdc, 0xb0, 0x34, 0x29, 0x3a, 0x11, 0x7e, 0x1f,
-		0x4f, 0xf1, 0x1b, 0x30, 0xf7, 0x19, 0x9d, 0x31, 0x44, 0xce,
-		0x6d,
-	},
-	.y = {
-		0x00, 0xfe, 0xaf, 0xfe, 0xf2, 0xe3, 0x31, 0xf2, 0x96, 0xe0,
-		0x71, 0xfa, 0x0d, 0xf9, 0x98, 0x2c, 0xfe, 0xa7, 0xd4, 0x3f,
-		0x2e,
-	},
-	.order = {
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x35, 0x1e, 0xe7, 0x86, 0xa8, 0x18, 0xf3, 0xa1, 0xa1,
-		0x6b,
-	},
-};
-
-static const struct {
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_SECG_PRIME_192K1 = {
-	.p = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-		0xff, 0xff, 0xee, 0x37,
-	},
-	.a = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-	},
-	.b = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x03,
-	},
-	.x = {
-		0xdb, 0x4f, 0xf1, 0x0e, 0xc0, 0x57, 0xe9, 0xae, 0x26, 0xb0,
-		0x7d, 0x02, 0x80, 0xb7, 0xf4, 0x34, 0x1d, 0xa5, 0xd1, 0xb1,
-		0xea, 0xe0, 0x6c, 0x7d,
-	},
-	.y = {
-		0x9b, 0x2f, 0x2f, 0x6d, 0x9c, 0x56, 0x28, 0xa7, 0x84, 0x41,
-		0x63, 0xd0, 0x15, 0xbe, 0x86, 0x34, 0x40, 0x82, 0xaa, 0x88,
-		0xd9, 0x5e, 0x2f, 0x9d,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xfe, 0x26, 0xf2, 0xfc, 0x17, 0x0f, 0x69, 0x46, 0x6a,
-		0x74, 0xde, 0xfd, 0x8d,
-	},
-};
-
-#endif /* ENABLE_SMALL_CURVES */
-
 static const struct {
 	uint8_t p[29];
 	uint8_t a[29];
@@ -1002,273 +526,6 @@ static const struct {
 	},
 };
 
-#ifdef ENABLE_SMALL_CURVES
-
-/* some wap/wtls curves */
-static const struct {
-	uint8_t p[15];
-	uint8_t a[15];
-	uint8_t b[15];
-	uint8_t x[15];
-	uint8_t y[15];
-	uint8_t order[15];
-} _EC_WTLS_8 = {
-	.p = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xfd, 0xe7,
-	},
-	.a = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00,
-	},
-	.b = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x03,
-	},
-	.x = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x01,
-	},
-	.y = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x02,
-	},
-	.order = {
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xec, 0xea,
-		0x55, 0x1a, 0xd8, 0x37, 0xe9,
-	},
-};
-
-static const struct {
-	uint8_t p[21];
-	uint8_t a[21];
-	uint8_t b[21];
-	uint8_t x[21];
-	uint8_t y[21];
-	uint8_t order[21];
-} _EC_WTLS_9 = {
-	.p = {
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x80,
-		0x8f,
-	},
-	.a = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00,
-	},
-	.b = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x03,
-	},
-	.x = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x01,
-	},
-	.y = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x02,
-	},
-	.order = {
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x01, 0xcd, 0xc9, 0x8a, 0xe0, 0xe2, 0xde, 0x57, 0x4a, 0xbf,
-		0x33,
-	},
-};
-
-static const struct {
-	uint8_t p[28];
-	uint8_t a[28];
-	uint8_t b[28];
-	uint8_t x[28];
-	uint8_t y[28];
-	uint8_t order[28];
-} _EC_WTLS_12 = {
-	.p = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-	},
-	.a = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-	},
-	.b = {
-		0xb4, 0x05, 0x0a, 0x85, 0x0c, 0x04, 0xb3, 0xab, 0xf5, 0x41,
-		0x32, 0x56, 0x50, 0x44, 0xb0, 0xb7, 0xd7, 0xbf, 0xd8, 0xba,
-		0x27, 0x0b, 0x39, 0x43, 0x23, 0x55, 0xff, 0xb4,
-	},
-	.x = {
-		0xb7, 0x0e, 0x0c, 0xbd, 0x6b, 0xb4, 0xbf, 0x7f, 0x32, 0x13,
-		0x90, 0xb9, 0x4a, 0x03, 0xc1, 0xd3, 0x56, 0xc2, 0x11, 0x22,
-		0x34, 0x32, 0x80, 0xd6, 0x11, 0x5c, 0x1d, 0x21,
-	},
-	.y = {
-		0xbd, 0x37, 0x63, 0x88, 0xb5, 0xf7, 0x23, 0xfb, 0x4c, 0x22,
-		0xdf, 0xe6, 0xcd, 0x43, 0x75, 0xa0, 0x5a, 0x07, 0x47, 0x64,
-		0x44, 0xd5, 0x81, 0x99, 0x85, 0x00, 0x7e, 0x34,
-	},
-	.order = {
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff, 0x16, 0xa2, 0xe0, 0xb8, 0xf0, 0x3e,
-		0x13, 0xdd, 0x29, 0x45, 0x5c, 0x5c, 0x2a, 0x3d,
-	},
-};
-
-static const struct {
-	uint8_t p[20];
-	uint8_t a[20];
-	uint8_t b[20];
-	uint8_t x[20];
-	uint8_t y[20];
-	uint8_t order[20];
-} _EC_brainpoolP160r1 = {
-	.p = {
-		0xe9, 0x5e, 0x4a, 0x5f, 0x73, 0x70, 0x59, 0xdc, 0x60, 0xdf,
-		0xc7, 0xad, 0x95, 0xb3, 0xd8, 0x13, 0x95, 0x15, 0x62, 0x0f,
-	},
-	.a = {
-		0x34, 0x0e, 0x7b, 0xe2, 0xa2, 0x80, 0xeb, 0x74, 0xe2, 0xbe,
-		0x61, 0xba, 0xda, 0x74, 0x5d, 0x97, 0xe8, 0xf7, 0xc3, 0x00,
-	},
-	.b = {
-		0x1e, 0x58, 0x9a, 0x85, 0x95, 0x42, 0x34, 0x12, 0x13, 0x4f,
-		0xaa, 0x2d, 0xbd, 0xec, 0x95, 0xc8, 0xd8, 0x67, 0x5e, 0x58,
-	},
-	.x = {
-		0xbe, 0xd5, 0xaf, 0x16, 0xea, 0x3f, 0x6a, 0x4f, 0x62, 0x93,
-		0x8c, 0x46, 0x31, 0xeb, 0x5a, 0xf7, 0xbd, 0xbc, 0xdb, 0xc3,
-	},
-	.y = {
-		0x16, 0x67, 0xcb, 0x47, 0x7a, 0x1a, 0x8e, 0xc3, 0x38, 0xf9,
-		0x47, 0x41, 0x66, 0x9c, 0x97, 0x63, 0x16, 0xda, 0x63, 0x21,
-	},
-	.order = {
-		0xe9, 0x5e, 0x4a, 0x5f, 0x73, 0x70, 0x59, 0xdc, 0x60, 0xdf,
-		0x59, 0x91, 0xd4, 0x50, 0x29, 0x40, 0x9e, 0x60, 0xfc, 0x09,
-	},
-};
-
-static const struct {
-	uint8_t p[20];
-	uint8_t a[20];
-	uint8_t b[20];
-	uint8_t x[20];
-	uint8_t y[20];
-	uint8_t order[20];
-} _EC_brainpoolP160t1 = {
-	.p = {
-		0xe9, 0x5e, 0x4a, 0x5f, 0x73, 0x70, 0x59, 0xdc, 0x60, 0xdf,
-		0xc7, 0xad, 0x95, 0xb3, 0xd8, 0x13, 0x95, 0x15, 0x62, 0x0f,
-	},
-	.a = {
-		0xe9, 0x5e, 0x4a, 0x5f, 0x73, 0x70, 0x59, 0xdc, 0x60, 0xdf,
-		0xc7, 0xad, 0x95, 0xb3, 0xd8, 0x13, 0x95, 0x15, 0x62, 0x0c,
-	},
-	.b = {
-		0x7a, 0x55, 0x6b, 0x6d, 0xae, 0x53, 0x5b, 0x7b, 0x51, 0xed,
-		0x2c, 0x4d, 0x7d, 0xaa, 0x7a, 0x0b, 0x5c, 0x55, 0xf3, 0x80,
-	},
-	.x = {
-		0xb1, 0x99, 0xb1, 0x3b, 0x9b, 0x34, 0xef, 0xc1, 0x39, 0x7e,
-		0x64, 0xba, 0xeb, 0x05, 0xac, 0xc2, 0x65, 0xff, 0x23, 0x78,
-	},
-	.y = {
-		0xad, 0xd6, 0x71, 0x8b, 0x7c, 0x7c, 0x19, 0x61, 0xf0, 0x99,
-		0x1b, 0x84, 0x24, 0x43, 0x77, 0x21, 0x52, 0xc9, 0xe0, 0xad,
-	},
-	.order = {
-		0xe9, 0x5e, 0x4a, 0x5f, 0x73, 0x70, 0x59, 0xdc, 0x60, 0xdf,
-		0x59, 0x91, 0xd4, 0x50, 0x29, 0x40, 0x9e, 0x60, 0xfc, 0x09,
-	},
-};
-
-static const struct {
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_brainpoolP192r1 = {
-	.p = {
-		0xc3, 0x02, 0xf4, 0x1d, 0x93, 0x2a, 0x36, 0xcd, 0xa7, 0xa3,
-		0x46, 0x30, 0x93, 0xd1, 0x8d, 0xb7, 0x8f, 0xce, 0x47, 0x6d,
-		0xe1, 0xa8, 0x62, 0x97,
-	},
-	.a = {
-		0x6a, 0x91, 0x17, 0x40, 0x76, 0xb1, 0xe0, 0xe1, 0x9c, 0x39,
-		0xc0, 0x31, 0xfe, 0x86, 0x85, 0xc1, 0xca, 0xe0, 0x40, 0xe5,
-		0xc6, 0x9a, 0x28, 0xef,
-	},
-	.b = {
-		0x46, 0x9a, 0x28, 0xef, 0x7c, 0x28, 0xcc, 0xa3, 0xdc, 0x72,
-		0x1d, 0x04, 0x4f, 0x44, 0x96, 0xbc, 0xca, 0x7e, 0xf4, 0x14,
-		0x6f, 0xbf, 0x25, 0xc9,
-	},
-	.x = {
-		0xc0, 0xa0, 0x64, 0x7e, 0xaa, 0xb6, 0xa4, 0x87, 0x53, 0xb0,
-		0x33, 0xc5, 0x6c, 0xb0, 0xf0, 0x90, 0x0a, 0x2f, 0x5c, 0x48,
-		0x53, 0x37, 0x5f, 0xd6,
-	},
-	.y = {
-		0x14, 0xb6, 0x90, 0x86, 0x6a, 0xbd, 0x5b, 0xb8, 0x8b, 0x5f,
-		0x48, 0x28, 0xc1, 0x49, 0x00, 0x02, 0xe6, 0x77, 0x3f, 0xa2,
-		0xfa, 0x29, 0x9b, 0x8f,
-	},
-	.order = {
-		0xc3, 0x02, 0xf4, 0x1d, 0x93, 0x2a, 0x36, 0xcd, 0xa7, 0xa3,
-		0x46, 0x2f, 0x9e, 0x9e, 0x91, 0x6b, 0x5b, 0xe8, 0xf1, 0x02,
-		0x9a, 0xc4, 0xac, 0xc1,
-	},
-};
-
-static const struct {
-	uint8_t p[24];
-	uint8_t a[24];
-	uint8_t b[24];
-	uint8_t x[24];
-	uint8_t y[24];
-	uint8_t order[24];
-} _EC_brainpoolP192t1 = {
-	.p = {
-		0xc3, 0x02, 0xf4, 0x1d, 0x93, 0x2a, 0x36, 0xcd, 0xa7, 0xa3,
-		0x46, 0x30, 0x93, 0xd1, 0x8d, 0xb7, 0x8f, 0xce, 0x47, 0x6d,
-		0xe1, 0xa8, 0x62, 0x97,
-	},
-	.a = {
-		0xc3, 0x02, 0xf4, 0x1d, 0x93, 0x2a, 0x36, 0xcd, 0xa7, 0xa3,
-		0x46, 0x30, 0x93, 0xd1, 0x8d, 0xb7, 0x8f, 0xce, 0x47, 0x6d,
-		0xe1, 0xa8, 0x62, 0x94,
-	},
-	.b = {
-		0x13, 0xd5, 0x6f, 0xfa, 0xec, 0x78, 0x68, 0x1e, 0x68, 0xf9,
-		0xde, 0xb4, 0x3b, 0x35, 0xbe, 0xc2, 0xfb, 0x68, 0x54, 0x2e,
-		0x27, 0x89, 0x7b, 0x79,
-	},
-	.x = {
-		0x3a, 0xe9, 0xe5, 0x8c, 0x82, 0xf6, 0x3c, 0x30, 0x28, 0x2e,
-		0x1f, 0xe7, 0xbb, 0xf4, 0x3f, 0xa7, 0x2c, 0x44, 0x6a, 0xf6,
-		0xf4, 0x61, 0x81, 0x29,
-	},
-	.y = {
-		0x09, 0x7e, 0x2c, 0x56, 0x67, 0xc2, 0x22, 0x3a, 0x90, 0x2a,
-		0xb5, 0xca, 0x44, 0x9d, 0x00, 0x84, 0xb7, 0xe5, 0xb3, 0xde,
-		0x7c, 0xcc, 0x01, 0xc9,
-	},
-	.order = {
-		0xc3, 0x02, 0xf4, 0x1d, 0x93, 0x2a, 0x36, 0xcd, 0xa7, 0xa3,
-		0x46, 0x2f, 0x9e, 0x9e, 0x91, 0x6b, 0x5b, 0xe8, 0xf1, 0x02,
-		0x9a, 0xc4, 0xac, 0xc1,
-	},
-};
-
-#endif /* ENABLE_SMALL_CURVES */
-
 static const struct {
 	uint8_t p[28];
 	uint8_t a[28];
@@ -1826,117 +1083,6 @@ static const struct ec_curve {
 	const uint8_t *order;
 } ec_curve_list[] = {
 	/* secg curves */
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.comment = "SECG/WTLS curve over a 112 bit prime field",
-		.nid = NID_secp112r1,
-		.seed_len = sizeof(_EC_SECG_PRIME_112R1.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_112R1.p),
-		.seed = _EC_SECG_PRIME_112R1.seed,
-		.p = _EC_SECG_PRIME_112R1.p,
-		.a = _EC_SECG_PRIME_112R1.a,
-		.b = _EC_SECG_PRIME_112R1.b,
-		.x = _EC_SECG_PRIME_112R1.x,
-		.y = _EC_SECG_PRIME_112R1.y,
-		.order = _EC_SECG_PRIME_112R1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "SECG curve over a 112 bit prime field",
-		.nid = NID_secp112r2,
-		.seed_len = sizeof(_EC_SECG_PRIME_112R2.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_112R2.p),
-		.seed = _EC_SECG_PRIME_112R2.seed,
-		.p = _EC_SECG_PRIME_112R2.p,
-		.a = _EC_SECG_PRIME_112R2.a,
-		.b = _EC_SECG_PRIME_112R2.b,
-		.x = _EC_SECG_PRIME_112R2.x,
-		.y = _EC_SECG_PRIME_112R2.y,
-		.order = _EC_SECG_PRIME_112R2.order,
-		.cofactor = 4,
-	},
-	{
-		.comment = "SECG curve over a 128 bit prime field",
-		.nid = NID_secp128r1,
-		.seed_len = sizeof(_EC_SECG_PRIME_128R1.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_128R1.p),
-		.seed = _EC_SECG_PRIME_128R1.seed,
-		.p = _EC_SECG_PRIME_128R1.p,
-		.a = _EC_SECG_PRIME_128R1.a,
-		.b = _EC_SECG_PRIME_128R1.b,
-		.x = _EC_SECG_PRIME_128R1.x,
-		.y = _EC_SECG_PRIME_128R1.y,
-		.order = _EC_SECG_PRIME_128R1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "SECG curve over a 128 bit prime field",
-		.nid = NID_secp128r2,
-		.seed_len = sizeof(_EC_SECG_PRIME_128R2.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_128R2.p),
-		.seed = _EC_SECG_PRIME_128R2.seed,
-		.p = _EC_SECG_PRIME_128R2.p,
-		.a = _EC_SECG_PRIME_128R2.a,
-		.b = _EC_SECG_PRIME_128R2.b,
-		.x = _EC_SECG_PRIME_128R2.x,
-		.y = _EC_SECG_PRIME_128R2.y,
-		.order = _EC_SECG_PRIME_128R2.order,
-		.cofactor = 4,
-	},
-	{
-		.comment = "SECG curve over a 160 bit prime field",
-		.nid = NID_secp160k1,
-		.param_len = sizeof(_EC_SECG_PRIME_160K1.p),
-		.p = _EC_SECG_PRIME_160K1.p,
-		.a = _EC_SECG_PRIME_160K1.a,
-		.b = _EC_SECG_PRIME_160K1.b,
-		.x = _EC_SECG_PRIME_160K1.x,
-		.y = _EC_SECG_PRIME_160K1.y,
-		.order = _EC_SECG_PRIME_160K1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "SECG curve over a 160 bit prime field",
-		.nid = NID_secp160r1,
-		.seed_len = sizeof(_EC_SECG_PRIME_160R1.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_160R1.p),
-		.seed = _EC_SECG_PRIME_160R1.seed,
-		.p = _EC_SECG_PRIME_160R1.p,
-		.a = _EC_SECG_PRIME_160R1.a,
-		.b = _EC_SECG_PRIME_160R1.b,
-		.x = _EC_SECG_PRIME_160R1.x,
-		.y = _EC_SECG_PRIME_160R1.y,
-		.order = _EC_SECG_PRIME_160R1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "SECG/WTLS curve over a 160 bit prime field",
-		.nid = NID_secp160r2,
-		.seed_len = sizeof(_EC_SECG_PRIME_160R2.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_160R2.p),
-		.seed = _EC_SECG_PRIME_160R2.seed,
-		.p = _EC_SECG_PRIME_160R2.p,
-		.a = _EC_SECG_PRIME_160R2.a,
-		.b = _EC_SECG_PRIME_160R2.b,
-		.x = _EC_SECG_PRIME_160R2.x,
-		.y = _EC_SECG_PRIME_160R2.y,
-		.order = _EC_SECG_PRIME_160R2.order,
-		.cofactor = 1,
-	},
-	/* SECG secp192r1 is the same as X9.62 prime192v1 and hence omitted */
-	{
-		.comment = "SECG curve over a 192 bit prime field",
-		.nid = NID_secp192k1,
-		.param_len = sizeof(_EC_SECG_PRIME_192K1.p),
-		.p = _EC_SECG_PRIME_192K1.p,
-		.a = _EC_SECG_PRIME_192K1.a,
-		.b = _EC_SECG_PRIME_192K1.b,
-		.x = _EC_SECG_PRIME_192K1.x,
-		.y = _EC_SECG_PRIME_192K1.y,
-		.order = _EC_SECG_PRIME_192K1.order,
-		.cofactor = 1,
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.comment = "SECG curve over a 224 bit prime field",
 		.nid = NID_secp224k1,
@@ -2005,50 +1151,6 @@ static const struct ec_curve {
 		.cofactor = 1,
 	},
 	/* X9.62 curves */
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.comment = "NIST/X9.62/SECG curve over a 192 bit prime field",
-		.nid = NID_X9_62_prime192v1,
-		.seed_len = sizeof(_EC_NIST_PRIME_192.seed),
-		.param_len = sizeof(_EC_NIST_PRIME_192.p),
-		.seed = _EC_NIST_PRIME_192.seed,
-		.p = _EC_NIST_PRIME_192.p,
-		.a = _EC_NIST_PRIME_192.a,
-		.b = _EC_NIST_PRIME_192.b,
-		.x = _EC_NIST_PRIME_192.x,
-		.y = _EC_NIST_PRIME_192.y,
-		.order = _EC_NIST_PRIME_192.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "X9.62 curve over a 192 bit prime field",
-		.nid = NID_X9_62_prime192v2,
-		.seed_len = sizeof(_EC_X9_62_PRIME_192V2.seed),
-		.param_len = sizeof(_EC_X9_62_PRIME_192V2.p),
-		.seed = _EC_X9_62_PRIME_192V2.seed,
-		.p = _EC_X9_62_PRIME_192V2.p,
-		.a = _EC_X9_62_PRIME_192V2.a,
-		.b = _EC_X9_62_PRIME_192V2.b,
-		.x = _EC_X9_62_PRIME_192V2.x,
-		.y = _EC_X9_62_PRIME_192V2.y,
-		.order = _EC_X9_62_PRIME_192V2.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "X9.62 curve over a 192 bit prime field",
-		.nid = NID_X9_62_prime192v3,
-		.seed_len = sizeof(_EC_X9_62_PRIME_192V3.seed),
-		.param_len = sizeof(_EC_X9_62_PRIME_192V3.p),
-		.seed = _EC_X9_62_PRIME_192V3.seed,
-		.p = _EC_X9_62_PRIME_192V3.p,
-		.a = _EC_X9_62_PRIME_192V3.a,
-		.b = _EC_X9_62_PRIME_192V3.b,
-		.x = _EC_X9_62_PRIME_192V3.x,
-		.y = _EC_X9_62_PRIME_192V3.y,
-		.order = _EC_X9_62_PRIME_192V3.order,
-		.cofactor = 1,
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.comment = "X9.62 curve over a 239 bit prime field",
 		.nid = NID_X9_62_prime239v1,
@@ -2105,122 +1207,7 @@ static const struct ec_curve {
 		.order = _EC_X9_62_PRIME_256V1.order,
 		.cofactor = 1,
 	},
-#ifdef ENABLE_SMALL_CURVES
-	{
-		.comment = "SECG/WTLS curve over a 112 bit prime field",
-		.nid = NID_wap_wsg_idm_ecid_wtls6,
-		.seed_len = sizeof(_EC_SECG_PRIME_112R1.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_112R1.p),
-		.seed = _EC_SECG_PRIME_112R1.seed,
-		.p = _EC_SECG_PRIME_112R1.p,
-		.a = _EC_SECG_PRIME_112R1.a,
-		.b = _EC_SECG_PRIME_112R1.b,
-		.x = _EC_SECG_PRIME_112R1.x,
-		.y = _EC_SECG_PRIME_112R1.y,
-		.order = _EC_SECG_PRIME_112R1.order,
-		.cofactor = 1,
-	},
-	{
-		/* XXX - this one's been wrong all along. Should use 160r1. */
-		.comment = "SECG/WTLS curve over a 160 bit prime field",
-		.nid = NID_wap_wsg_idm_ecid_wtls7,
-		.seed_len = sizeof(_EC_SECG_PRIME_160R2.seed),
-		.param_len = sizeof(_EC_SECG_PRIME_160R2.p),
-		.seed = _EC_SECG_PRIME_160R2.seed,
-		.p = _EC_SECG_PRIME_160R2.p,
-		.a = _EC_SECG_PRIME_160R2.a,
-		.b = _EC_SECG_PRIME_160R2.b,
-		.x = _EC_SECG_PRIME_160R2.x,
-		.y = _EC_SECG_PRIME_160R2.y,
-		.order = _EC_SECG_PRIME_160R2.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "WTLS curve over a 112 bit prime field",
-		.nid = NID_wap_wsg_idm_ecid_wtls8,
-		.param_len = sizeof(_EC_WTLS_8.p),
-		.p = _EC_WTLS_8.p,
-		.a = _EC_WTLS_8.a,
-		.b = _EC_WTLS_8.b,
-		.x = _EC_WTLS_8.x,
-		.y = _EC_WTLS_8.y,
-		.order = _EC_WTLS_8.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "WTLS curve over a 160 bit prime field",
-		.nid = NID_wap_wsg_idm_ecid_wtls9,
-		.param_len = sizeof(_EC_WTLS_9.p),
-		.p = _EC_WTLS_9.p,
-		.a = _EC_WTLS_9.a,
-		.b = _EC_WTLS_9.b,
-		.x = _EC_WTLS_9.x,
-		.y = _EC_WTLS_9.y,
-		.order = _EC_WTLS_9.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "WTLS curve over a 224 bit prime field",
-		.nid = NID_wap_wsg_idm_ecid_wtls12,
-		.param_len = sizeof(_EC_WTLS_12.p),
-		.p = _EC_WTLS_12.p,
-		.a = _EC_WTLS_12.a,
-		.b = _EC_WTLS_12.b,
-		.x = _EC_WTLS_12.x,
-		.y = _EC_WTLS_12.y,
-		.order = _EC_WTLS_12.order,
-		.cofactor = 1,
-	},
 	/* RFC 5639 curves */
-	{
-		.comment = "RFC 5639 curve over a 160 bit prime field",
-		.nid = NID_brainpoolP160r1,
-		.param_len = sizeof(_EC_brainpoolP160r1.p),
-		.p = _EC_brainpoolP160r1.p,
-		.a = _EC_brainpoolP160r1.a,
-		.b = _EC_brainpoolP160r1.b,
-		.x = _EC_brainpoolP160r1.x,
-		.y = _EC_brainpoolP160r1.y,
-		.order = _EC_brainpoolP160r1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "RFC 5639 curve over a 160 bit prime field",
-		.nid = NID_brainpoolP160t1,
-		.param_len = sizeof(_EC_brainpoolP160t1.p),
-		.p = _EC_brainpoolP160t1.p,
-		.a = _EC_brainpoolP160t1.a,
-		.b = _EC_brainpoolP160t1.b,
-		.x = _EC_brainpoolP160t1.x,
-		.y = _EC_brainpoolP160t1.y,
-		.order = _EC_brainpoolP160t1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "RFC 5639 curve over a 192 bit prime field",
-		.nid = NID_brainpoolP192r1,
-		.param_len = sizeof(_EC_brainpoolP192r1.p),
-		.p = _EC_brainpoolP192r1.p,
-		.a = _EC_brainpoolP192r1.a,
-		.b = _EC_brainpoolP192r1.b,
-		.x = _EC_brainpoolP192r1.x,
-		.y = _EC_brainpoolP192r1.y,
-		.order = _EC_brainpoolP192r1.order,
-		.cofactor = 1,
-	},
-	{
-		.comment = "RFC 5639 curve over a 192 bit prime field",
-		.nid = NID_brainpoolP192t1,
-		.param_len = sizeof(_EC_brainpoolP192t1.p),
-		.p = _EC_brainpoolP192t1.p,
-		.a = _EC_brainpoolP192t1.a,
-		.b = _EC_brainpoolP192t1.b,
-		.x = _EC_brainpoolP192t1.x,
-		.y = _EC_brainpoolP192t1.y,
-		.order = _EC_brainpoolP192t1.order,
-		.cofactor = 1,
-	},
-#endif /* ENABLE_SMALL_CURVES */
 	{
 		.comment = "RFC 5639 curve over a 224 bit prime field",
 		.nid = NID_brainpoolP224r1,
-- 
cgit v1.2.3-55-g6feb