rename FFC_PARAM_PTRS to FFC_OSSL_PARAMS

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28360)

diff --git a/crypto/dh/dh_backend.c b/crypto/dh/dh_backend.c
index 678934a8dbed021e54e45c83285b2c770126c72b..b15284cfff709a3ac4d251fc83658de303054b5e 100644 (file)
--- a/crypto/dh/dh_backend.c
+++ b/crypto/dh/dh_backend.c
@@ -89,7 +89,7 @@ int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[], int include_private)
 }
 
 int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *privlen,
-                          const FFC_PARAM_PTRS *pp)
+                          const FFC_OSSL_PARAMS *pp)
 {
     const long l = DH_get_length(dh);
 

diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c
index 50e11fc367a2d1ffe826eb8def39138ab63e9ca5..d2692b54204cdb4f1552b9ff854d7565115347a0 100644 (file)
--- a/crypto/ffc/ffc_params.c
+++ b/crypto/ffc/ffc_params.c
@@ -214,7 +214,7 @@ int ossl_ffc_params_cmp(const FFC_PARAMS *a, const FFC_PARAMS *b, int ignore_q)
 }
 
 int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
-                           const FFC_PARAM_PTRS *pp)
+                           const FFC_OSSL_PARAMS *pp)
 {
     int test_flags;
 

diff --git a/include/crypto/dh.h b/include/crypto/dh.h
index 7e9c3d076668fd3c9d837c8c316893ef8a287295..87e3d41eeccbbe4a8e9ee6b906b3476264d5c8e7 100644 (file)
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -34,7 +34,7 @@ int ossl_dh_get0_nid(const DH *dh);
 int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[]);
 int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[], int include_private);
 int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *privlen,
-                          const FFC_PARAM_PTRS *pp);
+                          const FFC_OSSL_PARAMS *pp);
 int ossl_dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM *pubkey,
                        OSSL_PARAM *privkey, int include_private);
 DH *ossl_dh_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,

diff --git a/include/internal/ffc.h b/include/internal/ffc.h
index f6006dbeace1367145f500cdbe844a0c580b76c4..a5e6fe24abf3a7dff39f8625f5a4170f0353ace7 100644 (file)
--- a/include/internal/ffc.h
+++ b/include/internal/ffc.h
@@ -137,7 +137,7 @@ typedef struct {
     OSSL_PARAM *validate_legacy;    /* OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY */
     OSSL_PARAM *digest;             /* OSSL_PKEY_PARAM_FFC_DIGEST */
     OSSL_PARAM *propq;              /* OSSL_PKEY_PARAM_FFC_DIGEST_PROPS */
-} FFC_PARAM_PTRS;
+} FFC_OSSL_PARAMS;
 
 void ossl_ffc_params_init(FFC_PARAMS *params);
 void ossl_ffc_params_cleanup(FFC_PARAMS *params);
@@ -216,7 +216,7 @@ int ossl_ffc_validate_private_key(const BIGNUM *upper, const BIGNUM *priv_key,
                                  int *ret);
 
 int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *tmpl,
-                           const FFC_PARAM_PTRS *pp);
+                           const FFC_OSSL_PARAMS *pp);
 int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[]);
 
 typedef struct dh_named_group_st DH_NAMED_GROUP;

diff --git a/providers/implementations/keymgmt/dh_kmgmt.c.in b/providers/implementations/keymgmt/dh_kmgmt.c.in
index 01488b4612edad2185648243960436e8ec6bdd69..740d38c1bfd2c8c93d0f9ae86635776ec700f988 100644 (file)
--- a/providers/implementations/keymgmt/dh_kmgmt.c.in
+++ b/providers/implementations/keymgmt/dh_kmgmt.c.in
@@ -320,7 +320,7 @@ static const OSSL_PARAM *dh_export_types(int selection)
 }
 
 struct dh_params_st {
-    FFC_PARAM_PTRS ffp;
+    FFC_OSSL_PARAMS ffp;
     OSSL_PARAM *bits;
     OSSL_PARAM *secbits;
     OSSL_PARAM *maxsize;

diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c.in b/providers/implementations/keymgmt/dsa_kmgmt.c.in
index 554903990f153c0d56d464d63aeb1c809dcb71fb..d636f28a6727d46b46257f8dd996185572b58fe2 100644 (file)
--- a/providers/implementations/keymgmt/dsa_kmgmt.c.in
+++ b/providers/implementations/keymgmt/dsa_kmgmt.c.in
@@ -317,7 +317,7 @@ static const OSSL_PARAM *dsa_export_types(int selection)
 }
 
 struct dsa_params_st {
-    FFC_PARAM_PTRS ffp;
+    FFC_OSSL_PARAMS ffp;
     OSSL_PARAM *bits;
     OSSL_PARAM *secbits;
     OSSL_PARAM *maxsize;