kem: rename files for autogeneration of param parsing

Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28149)

diff --git a/.gitignore b/.gitignore
index f25747dc6414ccc64c0c2daddfeaf87cd950cac4..725159064fc6b6897a890eb249d1951fff21b64e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -104,6 +104,10 @@ providers/implementations/kdfs/scrypt.c
 providers/implementations/kdfs/sshkdf.c
 providers/implementations/kdfs/sskdf.c
 providers/implementations/kdfs/tls1_prf.c
+providers/implementations/kem/ec_kem.c
+providers/implementations/kem/ecx_kem.c
+providers/implementations/kem/ml_kem_kem.c
+providers/implementations/kem/rsa_kem.c
 providers/implementations/keymgmt/ml_dsa_kmgmt.c
 providers/implementations/keymgmt/ml_kem_kmgmt.c
 providers/implementations/keymgmt/mlx_kmgmt.c

diff --git a/build.info b/build.info
index 97bb77233c4e00519a87e7feb1b1bdfcda156d19..e6a89fc8c7d4b4a4972c9f6144dbdf01f040d9ba 100644 (file)
--- a/build.info
+++ b/build.info
@@ -67,6 +67,10 @@ DEPEND[]=include/openssl/asn1.h \
          providers/implementations/kdfs/sskdf.c \
          providers/implementations/kdfs/tls1_prf.c \
          providers/implementations/kdfs/x942kdf.c \
+         providers/implementations/kem/ec_kem.c \
+         providers/implementations/kem/ecx_kem.c \
+         providers/implementations/kem/ml_kem_kem.c \
+         providers/implementations/kem/rsa_kem.c \
          providers/implementations/keymgmt/ml_dsa_kmgmt.c \
          providers/implementations/keymgmt/ml_kem_kmgmt.c \
          providers/implementations/keymgmt/mlx_kmgmt.c \
@@ -150,6 +154,10 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \
        providers/implementations/kdfs/sskdf.c \
        providers/implementations/kdfs/tls1_prf.c \
        providers/implementations/kdfs/x942kdf.c \
+       providers/implementations/kem/ec_kem.c \
+       providers/implementations/kem/ecx_kem.c \
+       providers/implementations/kem/ml_kem_kem.c \
+       providers/implementations/kem/rsa_kem.c \
        providers/implementations/keymgmt/ml_dsa_kmgmt.c \
        providers/implementations/keymgmt/ml_kem_kmgmt.c \
        providers/implementations/keymgmt/mlx_kmgmt.c \
@@ -219,6 +227,14 @@ GENERATE[providers/implementations/kdfs/tls1_prf.c]=\
     providers/implementations/kdfs/tls1_prf.c.in
 GENERATE[providers/implementations/kdfs/x942kdf.c]=\
     providers/implementations/kdfs/x942kdf.c.in
+GENERATE[providers/implementations/kem/ec_kem.c]=\
+    providers/implementations/kem/ec_kem.c.in
+GENERATE[providers/implementations/kem/ecx_kem.c]=\
+    providers/implementations/kem/ecx_kem.c.in
+GENERATE[providers/implementations/kem/ml_kem_kem.c]=\
+    providers/implementations/kem/ml_kem_kem.c.in
+GENERATE[providers/implementations/kem/rsa_kem.c]=\
+    providers/implementations/kem/rsa_kem.c.in
 GENERATE[providers/implementations/keymgmt/ml_dsa_kmgmt.c]=\
     providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
 GENERATE[providers/implementations/keymgmt/ml_kem_kmgmt.c]=\

diff --git a/providers/implementations/kem/eckem.h b/providers/implementations/include/prov/eckem.h
similarity index 100%
rename from providers/implementations/kem/eckem.h
rename to providers/implementations/include/prov/eckem.h

diff --git a/providers/implementations/kem/ec_kem.c b/providers/implementations/kem/ec_kem.c.in
similarity index 99%
rename from providers/implementations/kem/ec_kem.c
rename to providers/implementations/kem/ec_kem.c.in
index a48cbcaa34bc72cc0ef897ac47545300574a2365..86fe6b73b03e21b4159cf455cb698514336190fe 100644 (file)
--- a/providers/implementations/kem/ec_kem.c
+++ b/providers/implementations/kem/ec_kem.c.in
@@ -34,7 +34,7 @@
 #include "internal/hpke_util.h"
 #include "crypto/ec.h"
 #include "prov/ecx.h"
-#include "eckem.h"
+#include "prov/eckem.h"
 
 typedef struct {
     EC_KEY *recipient_key;

diff --git a/providers/implementations/kem/ecx_kem.c b/providers/implementations/kem/ecx_kem.c.in
similarity index 99%
rename from providers/implementations/kem/ecx_kem.c
rename to providers/implementations/kem/ecx_kem.c.in
index b158fbce422b231aa025d12a0eb476c5f759b679..8351a5f46a422b739763a36797a75e8f5b80d3fa 100644 (file)
--- a/providers/implementations/kem/ecx_kem.c
+++ b/providers/implementations/kem/ecx_kem.c.in
@@ -34,7 +34,7 @@
 #include "crypto/ecx.h"
 #include <openssl/hpke.h>
 #include "internal/hpke_util.h"
-#include "eckem.h"
+#include "prov/eckem.h"
 
 #define MAX_ECX_KEYLEN X448_KEYLEN
 

diff --git a/providers/implementations/kem/kem_util.c b/providers/implementations/kem/kem_util.c
index 1fd52e1c2d527e6f8c6510b0cf16718ab9e8e1fe..da733dacfe728ecfb618c17c3279f5e66616de05 100644 (file)
--- a/providers/implementations/kem/kem_util.c
+++ b/providers/implementations/kem/kem_util.c
@@ -10,7 +10,7 @@
 #include <string.h> /* for memcpy() */
 #include <openssl/core_names.h>
 #include <openssl/crypto.h>
-#include "eckem.h"
+#include "prov/eckem.h"
 
 typedef struct {
     unsigned int id;

diff --git a/providers/implementations/kem/ml_kem_kem.c b/providers/implementations/kem/ml_kem_kem.c.in
similarity index 100%
rename from providers/implementations/kem/ml_kem_kem.c
rename to providers/implementations/kem/ml_kem_kem.c.in

diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c.in
similarity index 100%
rename from providers/implementations/kem/rsa_kem.c
rename to providers/implementations/kem/rsa_kem.c.in