From b7999bdfe03c80fde52ed4c185355cdf26bdb5d1 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 4 May 2025 04:57:48 +0000 Subject: Move P-256 where it belongs ok jsing --- src/lib/libcrypto/ec/ec_curve.c | 134 ++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c index a505ae5026..ec7a4f5390 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.55 2025/05/03 10:15:50 tb Exp $ */ +/* $OpenBSD: ec_curve.c,v 1.56 2025/05/04 04:57:48 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -128,6 +128,57 @@ static const struct { }, }; +static const struct { + uint8_t seed[20]; + uint8_t p[32]; + uint8_t a[32]; + uint8_t b[32]; + uint8_t x[32]; + uint8_t y[32]; + uint8_t order[32]; +} _EC_NIST_PRIME_256 = { + .seed = { + 0xc4, 0x9d, 0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, + 0x78, 0xe1, 0x13, 0x9d, 0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, + }, + .p = { + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, + }, + .a = { + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xfc, + }, + .b = { + 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb, + 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, + 0xcc, 0x53, 0xb0, 0xf6, 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, + 0x60, 0x4b, + }, + .x = { + 0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, + 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2, 0x77, 0x03, 0x7d, 0x81, + 0x2d, 0xeb, 0x33, 0xa0, 0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, + 0xc2, 0x96, + }, + .y = { + 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, 0x8e, 0xe7, + 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16, 0x2b, 0xce, 0x33, 0x57, + 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, + 0x51, 0xf5, + }, + .order = { + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, + 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, + 0x25, 0x51, + }, +}; + static const struct { uint8_t seed[20]; uint8_t p[48]; @@ -389,57 +440,6 @@ static const struct { }, }; -static const struct { - uint8_t seed[20]; - uint8_t p[32]; - uint8_t a[32]; - uint8_t b[32]; - uint8_t x[32]; - uint8_t y[32]; - uint8_t order[32]; -} _EC_X9_62_PRIME_256V1 = { - .seed = { - 0xc4, 0x9d, 0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, - 0x78, 0xe1, 0x13, 0x9d, 0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, - }, - .p = { - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, - }, - .a = { - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xfc, - }, - .b = { - 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb, - 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, - 0xcc, 0x53, 0xb0, 0xf6, 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, - 0x60, 0x4b, - }, - .x = { - 0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, - 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2, 0x77, 0x03, 0x7d, 0x81, - 0x2d, 0xeb, 0x33, 0xa0, 0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, - 0xc2, 0x96, - }, - .y = { - 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, 0x8e, 0xe7, - 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16, 0x2b, 0xce, 0x33, 0x57, - 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, - 0x51, 0xf5, - }, - .order = { - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad, - 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, - 0x25, 0x51, - }, -}; - static const struct { uint8_t p[29]; uint8_t a[29]; @@ -1121,7 +1121,21 @@ static const struct ec_curve { .order = _EC_SECG_PRIME_256K1.order, .cofactor = 1, }, - /* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */ + { + /* Everyone except OpenSSL calls this secp256r1 or P-256. */ + .comment = "X9.62/SECG curve prime256v1", + .nid = NID_X9_62_prime256v1, + .seed_len = sizeof(_EC_NIST_PRIME_256.seed), + .param_len = sizeof(_EC_NIST_PRIME_256.p), + .seed = _EC_NIST_PRIME_256.seed, + .p = _EC_NIST_PRIME_256.p, + .a = _EC_NIST_PRIME_256.a, + .b = _EC_NIST_PRIME_256.b, + .x = _EC_NIST_PRIME_256.x, + .y = _EC_NIST_PRIME_256.y, + .order = _EC_NIST_PRIME_256.order, + .cofactor = 1, + }, { .comment = "NIST/SECG curve secp384r1", .nid = NID_secp384r1, @@ -1193,20 +1207,6 @@ static const struct ec_curve { .order = _EC_X9_62_PRIME_239V3.order, .cofactor = 1, }, - { - .comment = "X9.62/SECG curve prime256v1", - .nid = NID_X9_62_prime256v1, - .seed_len = sizeof(_EC_X9_62_PRIME_256V1.seed), - .param_len = sizeof(_EC_X9_62_PRIME_256V1.p), - .seed = _EC_X9_62_PRIME_256V1.seed, - .p = _EC_X9_62_PRIME_256V1.p, - .a = _EC_X9_62_PRIME_256V1.a, - .b = _EC_X9_62_PRIME_256V1.b, - .x = _EC_X9_62_PRIME_256V1.x, - .y = _EC_X9_62_PRIME_256V1.y, - .order = _EC_X9_62_PRIME_256V1.order, - .cofactor = 1, - }, /* RFC 5639 curves */ { .comment = "RFC 5639 curve brainpoolP224r1", -- cgit v1.2.3-55-g6feb