From 774fe435721ed1e7a35d08e4d710795ae8764a3b Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 8 Sep 2025 16:33:27 +1000 Subject: [PATCH] rename FFC_PARAM_PTRS to FFC_OSSL_PARAMS Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28360) --- crypto/dh/dh_backend.c | 2 +- crypto/ffc/ffc_params.c | 2 +- include/crypto/dh.h | 2 +- include/internal/ffc.h | 4 ++-- providers/implementations/keymgmt/dh_kmgmt.c.in | 2 +- providers/implementations/keymgmt/dsa_kmgmt.c.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/dh/dh_backend.c b/crypto/dh/dh_backend.c index 678934a8dbe..b15284cfff7 100644 --- 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 50e11fc367a..d2692b54204 100644 --- 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 7e9c3d07666..87e3d41eecc 100644 --- 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 f6006dbeace..a5e6fe24abf 100644 --- 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 01488b4612e..740d38c1bfd 100644 --- 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 554903990f1..d636f28a672 100644 --- 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; -- 2.47.3