Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fips: remove P-192 #24195

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fips: remove P-192 #24195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e7b4e
fips: remove P-192 (legacy operations only curve)
xnox Apr 18, 2024
57222bb
Skip P-192 tests in FIPS
xnox Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions crypto/ec/ec_curve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ typedef struct {
unsigned int cofactor; /* promoted to BN_ULONG */
} EC_CURVE_DATA;

#ifndef FIPS_MODULE
/* the nist prime curves */
static const struct {
EC_CURVE_DATA h;
Expand Down Expand Up @@ -61,6 +62,7 @@ static const struct {
0x99, 0xDE, 0xF8, 0x36, 0x14, 0x6B, 0xC9, 0xB1, 0xB4, 0xD2, 0x28, 0x31
}
};
#endif /* FIPS_MODULE */

static const struct {
EC_CURVE_DATA h;
Expand Down Expand Up @@ -2856,8 +2858,6 @@ static const ec_list_element curve_list[] = {
"NIST/SECG curve over a 521 bit prime field"},

/* X9.62 curves */
{NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
"NIST/X9.62/SECG curve over a 192 bit prime field"},
{NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
# if defined(ECP_NISTZ256_ASM)
EC_GFp_nistz256_method,
Expand Down
2 changes: 0 additions & 2 deletions providers/common/capabilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,8 @@ static const OSSL_PARAM param_group_list[][10] = {
TLS_GROUP_ENTRY("secp160r1", "secp160r1", "EC", 15),
TLS_GROUP_ENTRY("secp160r2", "secp160r2", "EC", 16),
TLS_GROUP_ENTRY("secp192k1", "secp192k1", "EC", 17),
# endif
TLS_GROUP_ENTRY("secp192r1", "prime192v1", "EC", 18),
TLS_GROUP_ENTRY("P-192", "prime192v1", "EC", 18), /* Alias of above */
# ifndef FIPS_MODULE
TLS_GROUP_ENTRY("secp224k1", "secp224k1", "EC", 19),
# endif
TLS_GROUP_ENTRY("secp224r1", "secp224r1", "EC", 20),
Expand Down
9 changes: 0 additions & 9 deletions test/acvp_test.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,6 @@ static const unsigned char ecdsa_sigver_s1[] = {
0xB1, 0xAC,
};
static const struct ecdsa_sigver_st ecdsa_sigver_data[] = {
{
"SHA-1",
"P-192",
ITM(ecdsa_sigver_msg0),
ITM(ecdsa_sigver_pub0),
ITM(ecdsa_sigver_r0),
ITM(ecdsa_sigver_s0),
PASS,
},
{
"SHA2-512",
"P-521",
Expand Down
3 changes: 3 additions & 0 deletions test/recipes/65-test_cmp_protect.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ plan skip_all => "This test is not supported in a no-cmp build"
plan skip_all => "This test is not supported in a shared library build on Windows"
if $^O eq 'MSWin32' && !disabled("shared");

plan skip_all => "Intermediate_CA.crt uses legacy P-192"
unless $no_fips;

plan tests => 2 + ($no_fips ? 0 : 1); #fips test

my @basic_cmd = ("cmp_protect_test",
Expand Down
3 changes: 3 additions & 0 deletions test/recipes/65-test_cmp_vfy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ plan skip_all => "This test is not supported in a no-cmp build"
plan skip_all => "This test is not supported in a no-ec build"
if disabled("ec");

plan skip_all => "Intermediate_CA.crt uses legacy P-192"
unless $no_fips;

plan tests => 2 + ($no_fips ? 0 : 1); #fips test

my @basic_cmd = ("cmp_vfy_test",
Expand Down