exchange: Use include file for generated code

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28838)

diff --git a/.gitignore b/.gitignore
index bdfca92a2381980c6f00d62a05e0f54ecc95d2c1..9f827a4e3cb0f8a997dd1422d34cf31ca8aafb77 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -88,9 +88,9 @@ providers/common/include/prov/der_ml_dsa.h
 providers/common/include/prov/der_hkdf.h
 providers/implementations/asymciphers/rsa_enc.inc
 providers/implementations/asymciphers/sm2_enc.inc
-providers/implementations/exchange/dh_exch.c
-providers/implementations/exchange/ecdh_exch.c
-providers/implementations/exchange/ecx_exch.c
+providers/implementations/exchange/dh_exch.inc
+providers/implementations/exchange/ecdh_exch.inc
+providers/implementations/exchange/ecx_exch.inc
 providers/implementations/encode_decode/decode_der2key.inc
 providers/implementations/encode_decode/decode_epki2pki.inc
 providers/implementations/encode_decode/decode_pem2der.inc

diff --git a/build.info b/build.info
index 6f28022673d8ded057da50704621c91c8f847865..0dc15c8d825a3765739e00c8de297fd579bc950c 100644 (file)
--- a/build.info
+++ b/build.info
@@ -50,9 +50,9 @@ DEPEND[]=include/openssl/asn1.h \
          include/crypto/bn_conf.h include/crypto/dso_conf.h \
          providers/implementations/asymciphers/rsa_enc.inc \
          providers/implementations/asymciphers/sm2_enc.inc \
-         providers/implementations/exchange/dh_exch.c \
-         providers/implementations/exchange/ecdh_exch.c \
-         providers/implementations/exchange/ecx_exch.c \
+         providers/implementations/exchange/dh_exch.inc \
+         providers/implementations/exchange/ecdh_exch.inc \
+         providers/implementations/exchange/ecx_exch.inc \
          providers/implementations/encode_decode/decode_der2key.inc \
          providers/implementations/encode_decode/decode_epki2pki.inc \
          providers/implementations/encode_decode/decode_pem2der.inc \
@@ -168,9 +168,9 @@ GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
 
 DEPEND[providers/implementations/asymciphers/rsa_enc.inc \
        providers/implementations/asymciphers/sm2_enc.inc \
-       providers/implementations/exchange/dh_exch.c \
-       providers/implementations/exchange/ecdh_exch.c \
-       providers/implementations/exchange/ecx_exch.c \
+       providers/implementations/exchange/dh_exch.inc \
+       providers/implementations/exchange/ecdh_exch.inc \
+       providers/implementations/exchange/ecx_exch.inc \
        providers/implementations/encode_decode/decode_der2key.inc \
        providers/implementations/encode_decode/decode_epki2pki.inc \
        providers/implementations/encode_decode/decode_pem2der.inc \
@@ -255,12 +255,12 @@ GENERATE[providers/implementations/asymciphers/rsa_enc.inc]=\
     providers/implementations/asymciphers/rsa_enc.inc.in
 GENERATE[providers/implementations/asymciphers/sm2_enc.inc]=\
     providers/implementations/asymciphers/sm2_enc.inc.in
-GENERATE[providers/implementations/exchange/dh_exch.c]=\
-    providers/implementations/exchange/dh_exch.c.in
-GENERATE[providers/implementations/exchange/ecdh_exch.c]=\
-    providers/implementations/exchange/ecdh_exch.c.in
-GENERATE[providers/implementations/exchange/ecx_exch.c]=\
-    providers/implementations/exchange/ecx_exch.c.in
+GENERATE[providers/implementations/exchange/dh_exch.inc]=\
+    providers/implementations/exchange/dh_exch.inc.in
+GENERATE[providers/implementations/exchange/ecdh_exch.inc]=\
+    providers/implementations/exchange/ecdh_exch.inc.in
+GENERATE[providers/implementations/exchange/ecx_exch.inc]=\
+    providers/implementations/exchange/ecx_exch.inc.in
 GENERATE[providers/implementations/encode_decode/decode_der2key.inc]=\
     providers/implementations/encode_decode/decode_der2key.inc.in
 GENERATE[providers/implementations/encode_decode/decode_epki2pki.inc]=\

diff --git a/providers/implementations/exchange/dh_exch.c.in b/providers/implementations/exchange/dh_exch.c
similarity index 90%
rename from providers/implementations/exchange/dh_exch.c.in
rename to providers/implementations/exchange/dh_exch.c
index 0aa4c85bb9909d387914baf34cc0986d59220873..8f1cd599a8cb05722ff87eb64a2e21cfe33b6a39 100644 (file)
--- a/providers/implementations/exchange/dh_exch.c.in
+++ b/providers/implementations/exchange/dh_exch.c
@@ -6,9 +6,6 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-{-
-use OpenSSL::paramnames qw(produce_param_decoder);
--}
 
 /*
  * DH low level APIs are deprecated for public use, but still ok for
@@ -30,6 +27,7 @@ use OpenSSL::paramnames qw(produce_param_decoder);
 #include "prov/provider_ctx.h"
 #include "prov/securitycheck.h"
 #include "crypto/dh.h"
+#include "providers/implementations/exchange/dh_exch.inc"
 
 static OSSL_FUNC_keyexch_newctx_fn dh_newctx;
 static OSSL_FUNC_keyexch_init_fn dh_init;
@@ -341,18 +339,6 @@ err:
     return NULL;
 }
 
-{- produce_param_decoder('dh_set_ctx_params',
-                         (['OSSL_EXCHANGE_PARAM_PAD',               'pad',    'int'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',          'kdf',    'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',        'digest', 'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS',  'propq',  'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',        'len',    'size_t'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',           'ukm',    'octet_string'],
-                          ['OSSL_KDF_PARAM_CEK_ALG',                'cekalg', 'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK',    'ind_k',  'int', 'fips'],
-                          ['OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK', 'ind_d',  'int', 'fips'],
-                         )); -}
-
 static int dh_set_ctx_params(void *vpdhctx, const OSSL_PARAM params[])
 {
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
@@ -465,15 +451,6 @@ static const OSSL_PARAM *dh_settable_ctx_params(ossl_unused void *vpdhctx,
     return dh_set_ctx_params_list;
 }
 
-{- produce_param_decoder('dh_get_ctx_params',
-                         (['OSSL_EXCHANGE_PARAM_KDF_TYPE',           'kdf',    'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',         'digest', 'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',         'len',    'size_t'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',            'ukm',    'octet_ptr'],
-                          ['OSSL_KDF_PARAM_CEK_ALG',                 'cekalg', 'utf8_string'],
-                          ['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind',    'int', 'fips'],
-                         )); -}
-
 static const OSSL_PARAM *dh_gettable_ctx_params(ossl_unused void *vpdhctx,
                                                 ossl_unused void *provctx)
 {

diff --git a/providers/implementations/exchange/dh_exch.inc.in b/providers/implementations/exchange/dh_exch.inc.in
new file mode 100644 (file)
index 0000000..9a031d1
--- /dev/null
+++ b/providers/implementations/exchange/dh_exch.inc.in
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 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
+ */
+
+{-
+use OpenSSL::paramnames qw(produce_param_decoder);
+-}
+
+{- produce_param_decoder('dh_set_ctx_params',
+                         (['OSSL_EXCHANGE_PARAM_PAD',               'pad',    'int'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',          'kdf',    'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',        'digest', 'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS',  'propq',  'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',        'len',    'size_t'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',           'ukm',    'octet_string'],
+                          ['OSSL_KDF_PARAM_CEK_ALG',                'cekalg', 'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK',    'ind_k',  'int', 'fips'],
+                          ['OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK', 'ind_d',  'int', 'fips'],
+                         )); -}
+
+{- produce_param_decoder('dh_get_ctx_params',
+                         (['OSSL_EXCHANGE_PARAM_KDF_TYPE',           'kdf',    'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',         'digest', 'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',         'len',    'size_t'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',            'ukm',    'octet_ptr'],
+                          ['OSSL_KDF_PARAM_CEK_ALG',                 'cekalg', 'utf8_string'],
+                          ['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind',    'int', 'fips'],
+                         )); -}

diff --git a/providers/implementations/exchange/ecdh_exch.c.in b/providers/implementations/exchange/ecdh_exch.c
similarity index 91%
rename from providers/implementations/exchange/ecdh_exch.c.in
rename to providers/implementations/exchange/ecdh_exch.c
index 43e1b78d589f4af1f30d8ba15cebbb0dd160c31a..e970545e34072c5d5c3ec2602129db306bcc34e8 100644 (file)
--- a/providers/implementations/exchange/ecdh_exch.c.in
+++ b/providers/implementations/exchange/ecdh_exch.c
@@ -6,9 +6,6 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-{-
-use OpenSSL::paramnames qw(produce_param_decoder);
--}
 
 /*
  * ECDH low level APIs are deprecated for public use, but still ok for
@@ -31,6 +28,7 @@ use OpenSSL::paramnames qw(produce_param_decoder);
 #include "prov/implementations.h"
 #include "prov/securitycheck.h"
 #include "crypto/ec.h" /* ossl_ecdh_kdf_X9_63() */
+#include "providers/implementations/exchange/ecdh_exch.inc"
 
 static OSSL_FUNC_keyexch_newctx_fn ecdh_newctx;
 static OSSL_FUNC_keyexch_init_fn ecdh_init;
@@ -248,18 +246,6 @@ void *ecdh_dupctx(void *vpecdhctx)
     return NULL;
 }
 
-{- produce_param_decoder('ecdh_set_ctx_params',
-                         (['OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE',    'mode',      'int'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',                 'kdf',       'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',               'digest',    'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS',         'propq',     'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',               'len',       'size_t'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',                  'ukm',       'octet_string'],
-                          ['OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK',           'ind_k',     'int', 'fips'],
-                          ['OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK',        'ind_d',     'int', 'fips'],
-                          ['OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int', 'fips'],
-                         )); -}
-
 static
 int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
 {
@@ -365,15 +351,6 @@ const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *vpecdhctx,
     return ecdh_set_ctx_params_list;
 }
 
-{- produce_param_decoder('ecdh_get_ctx_params',
-                         (['OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE', 'mode',   'int'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',              'kdf',    'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',            'digest', 'utf8_string'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',            'len',    'size_t'],
-                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',               'ukm',    'octet_ptr'],
-                          ['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR',    'ind',    'int', 'fips'],
-                         )); -}
-
 static
 int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
 {

diff --git a/providers/implementations/exchange/ecdh_exch.inc.in b/providers/implementations/exchange/ecdh_exch.inc.in
new file mode 100644 (file)
index 0000000..9778bf6
--- /dev/null
+++ b/providers/implementations/exchange/ecdh_exch.inc.in
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 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
+ */
+
+{-
+use OpenSSL::paramnames qw(produce_param_decoder);
+-}
+
+{- produce_param_decoder('ecdh_set_ctx_params',
+                         (['OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE',    'mode',      'int'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',                 'kdf',       'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',               'digest',    'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS',         'propq',     'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',               'len',       'size_t'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',                  'ukm',       'octet_string'],
+                          ['OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK',           'ind_k',     'int', 'fips'],
+                          ['OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK',        'ind_d',     'int', 'fips'],
+                          ['OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int', 'fips'],
+                         )); -}
+
+{- produce_param_decoder('ecdh_get_ctx_params',
+                         (['OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE', 'mode',   'int'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_TYPE',              'kdf',    'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_DIGEST',            'digest', 'utf8_string'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_OUTLEN',            'len',    'size_t'],
+                          ['OSSL_EXCHANGE_PARAM_KDF_UKM',               'ukm',    'octet_ptr'],
+                          ['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR',    'ind',    'int', 'fips'],
+                         )); -}

diff --git a/providers/implementations/exchange/ecx_exch.c.in b/providers/implementations/exchange/ecx_exch.c
similarity index 96%
rename from providers/implementations/exchange/ecx_exch.c.in
rename to providers/implementations/exchange/ecx_exch.c
index 5fa6595cedf0969391c5ded8ed0bc598cf130a0a..a88a677ac438f6c6e78b6fd27614bd8a45da6bf4 100644 (file)
--- a/providers/implementations/exchange/ecx_exch.c.in
+++ b/providers/implementations/exchange/ecx_exch.c
@@ -6,9 +6,6 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-{-
-use OpenSSL::paramnames qw(produce_param_decoder);
--}
 
 #include <openssl/crypto.h>
 #include <openssl/core_dispatch.h>
@@ -22,6 +19,10 @@ use OpenSSL::paramnames qw(produce_param_decoder);
 #include "prov/providercommon.h"
 #include "prov/securitycheck.h"
 
+#ifdef FIPS_MODULE
+# include "providers/implementations/exchange/ecx_exch.inc"
+#endif
+
 static OSSL_FUNC_keyexch_newctx_fn x25519_newctx;
 static OSSL_FUNC_keyexch_newctx_fn x448_newctx;
 static OSSL_FUNC_keyexch_init_fn x25519_init;
@@ -181,9 +182,7 @@ static void *ecx_dupctx(void *vecxctx)
 }
 
 #ifdef FIPS_MODULE
-{- produce_param_decoder('ecx_get_ctx_params',
-                         (['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'],
-                         )); -}
+
 #endif
 
 static const OSSL_PARAM *ecx_gettable_ctx_params(ossl_unused void *vctx,

diff --git a/providers/implementations/exchange/ecx_exch.inc.in b/providers/implementations/exchange/ecx_exch.inc.in
new file mode 100644 (file)
index 0000000..0b6787b
--- /dev/null
+++ b/providers/implementations/exchange/ecx_exch.inc.in
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 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
+ */
+
+{-
+use OpenSSL::paramnames qw(produce_param_decoder);
+-}
+
+{- produce_param_decoder('ecx_get_ctx_params',
+                         (['OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'],
+                         )); -}