Commit 862229aa79 for openssl.org
commit 862229aa7928a7ddd8404e38f0131a865c28c151
Author: Pauli <paul.dale@oracle.com>
Date: Mon Aug 31 13:37:54 2026 +1000
fips: removal of ec_kmgmt_imexport.inc requires metadata updates
Remove the obsolete include and its entries from the module sources and checksum files.
Assisted-by: ChatGPT:gpt-5.6Sol
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
(Merged from https://github.com/openssl/openssl/pull/32502)
diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index 598c3bb44d..ae50c4a24b 100644
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -736,7 +736,6 @@ dc82a1648da73e5b4317b3e9923da2ed9f7eb1419383b562cd9ff5613b72af5e providers/impl
6e7674572b3824a76270bf51d528c79ecea8e7867aefcda06fcc7d6b75db35b6 providers/implementations/keymgmt/dh_kmgmt.c
d34296ae8595aa1ed90b5652ab7e8fb7e2c5131f5dac7b69eeed7f0fdc2cb6ad providers/implementations/keymgmt/dsa_kmgmt.c
036ef3ffd9452f3079aa07792ce9ad0fcc28d8e66c9fec429e1015c749c81ba7 providers/implementations/keymgmt/ec_kmgmt.c
-c3035535ca629fc9a85f64f62412b550b5c8185e57e6382937dc6de374fc5972 providers/implementations/keymgmt/ec_kmgmt_imexport.inc
4f549f95a1781038b107c11c0f961f7e95fe5e002812fb291ecf1ab45a45a20f providers/implementations/keymgmt/ecx_kmgmt.c
daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d providers/implementations/keymgmt/kdf_legacy_kmgmt.c
487f2b99c0dd9c51c63df758884c3f9bff45cc52b302c402df1fda578f4851ef providers/implementations/keymgmt/mac_legacy_kmgmt.c
diff --git a/providers/fips.checksum b/providers/fips.checksum
index 2c7bab5eab..52d69bfc38 100644
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-864d3535e188440ca60b8268ce8137e0cffb870be990531fd9f68a23f0ffa898 providers/fips-sources.checksums
+2302f17a8b7f641b26d6d0ca1694ae10f87c30f7532264d4d5e8644b891712ff providers/fips-sources.checksums
diff --git a/providers/fips.module.sources b/providers/fips.module.sources
index 5358458573..f6c46d0129 100644
--- a/providers/fips.module.sources
+++ b/providers/fips.module.sources
@@ -774,7 +774,6 @@ providers/implementations/keymgmt/dh_kmgmt.inc.in
providers/implementations/keymgmt/dsa_kmgmt.c
providers/implementations/keymgmt/dsa_kmgmt.inc.in
providers/implementations/keymgmt/ec_kmgmt.c
-providers/implementations/keymgmt/ec_kmgmt_imexport.inc
providers/implementations/keymgmt/ecx_kmgmt.c
providers/implementations/keymgmt/ecx_kmgmt.inc.in
providers/implementations/keymgmt/kdf_legacy_kmgmt.c
diff --git a/providers/implementations/keymgmt/ec_kmgmt_imexport.inc b/providers/implementations/keymgmt/ec_kmgmt_imexport.inc
deleted file mode 100644
index b242fd17ee..0000000000
--- a/providers/implementations/keymgmt/ec_kmgmt_imexport.inc
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
-*/
-
-/*
- * This file is meant to be included from ec_kmgmt.c
- */
-
-static const OSSL_PARAM ec_private_key_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_public_key_types[] = {
- EC_IMEXPORTABLE_PUBLIC_KEY,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_key_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_PUBLIC_KEY,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_dom_parameters_types[] = {
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_5_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_6_types[] = {
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_key_domp_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_other_parameters_types[] = {
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_9_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_10_types[] = {
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_11_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_all_parameters_types[] = {
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_13_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_14_types[] = {
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-static const OSSL_PARAM ec_all_types[] = {
- EC_IMEXPORTABLE_PRIVATE_KEY,
- EC_IMEXPORTABLE_PUBLIC_KEY,
- EC_IMEXPORTABLE_DOM_PARAMETERS,
- EC_IMEXPORTABLE_OTHER_PARAMETERS,
- OSSL_PARAM_END
-};
-
-static const OSSL_PARAM *const ec_types[] = {
- NULL,
- ec_private_key_types,
- ec_public_key_types,
- ec_key_types,
- ec_dom_parameters_types,
- ec_5_types,
- ec_6_types,
- ec_key_domp_types,
- ec_other_parameters_types,
- ec_9_types,
- ec_10_types,
- ec_11_types,
- ec_all_parameters_types,
- ec_13_types,
- ec_14_types,
- ec_all_types
-};