Commit 05d12fdd95 for openssl.org
commit 05d12fdd955d4cb3efc769becc3d5ceb9a322fdc
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Tue Sep 16 16:25:33 2025 +0200
providers/implementations/keymgmt/ecx_kmgmt.c.in: remove PCT on ECX import
While PCT on import has been removed for DH, EC, RSA, and SLH-DSA,
ECX seems to be overlooked. Correct that omission.
Complements: 7f7f75816f26 "import pct: remove import PCTs for most algorithms"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28573)
diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c.in b/providers/implementations/keymgmt/ecx_kmgmt.c.in
index 1a75cd1c32..cd1a8fa354 100644
--- a/providers/implementations/keymgmt/ecx_kmgmt.c.in
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c.in
@@ -229,14 +229,6 @@ static int ecx_import(void *keydata, int selection, const OSSL_PARAM params[])
include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
ok = ok && ossl_ecx_key_fromdata(key, p.pub, p.priv, include_private);
-#ifdef FIPS_MODULE
- if (ok > 0 && ecx_key_type_is_ed(key->type) && !ossl_fips_self_testing())
- if (key->haspubkey && key->privkey != NULL) {
- ok = ecd_fips140_pairwise_test(key, key->type, 1);
- if (ok <= 0)
- ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT);
- }
-#endif /* FIPS_MODULE */
return ok;
}