Consistent naming for context gettable param queries .

All instances of EVP_*_CTX_gettable_params functions have been renamed
to EVP_*_gettable_ctx_params.  Except for the EVP_MD ones which were changed
already.

These functions do not take EVP_*_CTX arguments so their prior naming was
misleading.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10052)

diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index 78200c58766befc5554eaef822ed955d0fb346d0..fd28b484b9d5849cca7b715a777b1268e51de0b1 100644 (file)
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -341,7 +341,7 @@ opthelp:
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =

-            app_params_new_from_opts(opts, EVP_MAC_CTX_settable_params(mac));
+            app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));

 
         if (params == NULL)
             goto end;
 
         if (params == NULL)
             goto end;

diff --git a/apps/kdf.c b/apps/kdf.c
index c2304306970a9ad8540324518473b576da82b1cd..35cc0db21c57bf2732c719d4ff4593b1db6029b6 100644 (file)
--- a/apps/kdf.c
+++ b/apps/kdf.c
@@ -96,7 +96,7 @@ opthelp:
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =

-            app_params_new_from_opts(opts, EVP_KDF_CTX_settable_params(kdf));
+            app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf));

 
         if (params == NULL)
             goto err;
 
         if (params == NULL)
             goto err;

diff --git a/apps/list.c b/apps/list.c
index 5348cc68dd3f487ed5643a9bd2c7e2d49bdcfb4a..d7c46906aa30ee371a2153be9b35f1cb0ca7b928 100644 (file)
--- a/apps/list.c
+++ b/apps/list.c
@@ -76,9 +76,9 @@ static void list_ciphers(void)
             print_param_types("retrievable algorithm parameters",
                               EVP_CIPHER_gettable_params(c), 4);
             print_param_types("retrievable operation parameters",
             print_param_types("retrievable algorithm parameters",
                               EVP_CIPHER_gettable_params(c), 4);
             print_param_types("retrievable operation parameters",

-                              EVP_CIPHER_CTX_gettable_params(c), 4);
+                              EVP_CIPHER_gettable_ctx_params(c), 4);

             print_param_types("settable operation parameters",
             print_param_types("settable operation parameters",

-                              EVP_CIPHER_CTX_settable_params(c), 4);
+                              EVP_CIPHER_settable_ctx_params(c), 4);

         }
     }
     sk_EVP_CIPHER_pop_free(ciphers, EVP_CIPHER_free);
         }
     }
     sk_EVP_CIPHER_pop_free(ciphers, EVP_CIPHER_free);


@@ -186,9 +186,9 @@ static void list_macs(void)
             print_param_types("retrievable algorithm parameters",
                               EVP_MAC_gettable_params(m), 4);
             print_param_types("retrievable operation parameters",
             print_param_types("retrievable algorithm parameters",
                               EVP_MAC_gettable_params(m), 4);
             print_param_types("retrievable operation parameters",

-                              EVP_MAC_CTX_gettable_params(m), 4);
+                              EVP_MAC_gettable_ctx_params(m), 4);

             print_param_types("settable operation parameters",
             print_param_types("settable operation parameters",

-                              EVP_MAC_CTX_settable_params(m), 4);
+                              EVP_MAC_settable_ctx_params(m), 4);

         }
     }
     sk_EVP_MAC_pop_free(macs, EVP_MAC_free);
         }
     }
     sk_EVP_MAC_pop_free(macs, EVP_MAC_free);


@@ -236,9 +236,9 @@ static void list_kdfs(void)
             print_param_types("retrievable algorithm parameters",
                               EVP_KDF_gettable_params(m), 4);
             print_param_types("retrievable operation parameters",
             print_param_types("retrievable algorithm parameters",
                               EVP_KDF_gettable_params(m), 4);
             print_param_types("retrievable operation parameters",

-                              EVP_KDF_CTX_gettable_params(m), 4);
+                              EVP_KDF_gettable_ctx_params(m), 4);

             print_param_types("settable operation parameters",
             print_param_types("settable operation parameters",

-                              EVP_KDF_CTX_settable_params(m), 4);
+                              EVP_KDF_settable_ctx_params(m), 4);

         }
     }
     sk_EVP_KDF_pop_free(kdfs, EVP_KDF_free);
         }
     }
     sk_EVP_KDF_pop_free(kdfs, EVP_KDF_free);

diff --git a/apps/mac.c b/apps/mac.c
index 205d82f779136144fb1bf6439c7f311f2530a91c..8383d0d7b39b83737988a619dec1bc4479a282c2 100644 (file)
--- a/apps/mac.c
+++ b/apps/mac.c
@@ -105,7 +105,7 @@ opthelp:
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =
     if (opts != NULL) {
         int ok = 1;
         OSSL_PARAM *params =

-            app_params_new_from_opts(opts, EVP_MAC_CTX_settable_params(mac));
+            app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));

 
         if (params == NULL)
             goto err;
 
         if (params == NULL)
             goto err;

diff --git a/apps/provider.c b/apps/provider.c
index 29afdcef48cfeff26175666edb15b68a8f960f4b..ab91e68f431b745f36161267bfafe10fb1992e85 100644 (file)
--- a/apps/provider.c
+++ b/apps/provider.c
@@ -108,8 +108,8 @@ static void do_cipher(EVP_CIPHER *cipher, void *meta)
 {
     do_method(cipher, EVP_CIPHER_name(cipher),
               EVP_CIPHER_gettable_params(cipher),
 {
     do_method(cipher, EVP_CIPHER_name(cipher),
               EVP_CIPHER_gettable_params(cipher),

-              EVP_CIPHER_CTX_gettable_params(cipher),
-              EVP_CIPHER_CTX_settable_params(cipher),
+              EVP_CIPHER_gettable_ctx_params(cipher),
+              EVP_CIPHER_settable_ctx_params(cipher),

               meta);
 }
 
               meta);
 }
 


@@ -126,8 +126,8 @@ static void do_mac(EVP_MAC *mac, void *meta)
 {
     do_method(mac, EVP_MAC_name(mac),
               EVP_MAC_gettable_params(mac),
 {
     do_method(mac, EVP_MAC_name(mac),
               EVP_MAC_gettable_params(mac),

-              EVP_MAC_CTX_gettable_params(mac),
-              EVP_MAC_CTX_settable_params(mac),
+              EVP_MAC_gettable_ctx_params(mac),
+              EVP_MAC_settable_ctx_params(mac),

               meta);
 }
 
               meta);
 }
 

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index a3fb5f742403e01216c1a189a63e3c491e592a6d..09c49b6202dd8c56050a55201269c0ab4fe5fbaf 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -1181,14 +1181,14 @@ const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher)
     return NULL;
 }
 
     return NULL;
 }
 

-const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(const EVP_CIPHER *cipher)
+const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher)

 {
     if (cipher != NULL && cipher->settable_ctx_params != NULL)
         return cipher->settable_ctx_params();
     return NULL;
 }
 
 {
     if (cipher != NULL && cipher->settable_ctx_params != NULL)
         return cipher->settable_ctx_params();
     return NULL;
 }
 

-const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(const EVP_CIPHER *cipher)
+const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher)

 {
     if (cipher != NULL && cipher->gettable_ctx_params != NULL)
         return cipher->gettable_ctx_params();
 {
     if (cipher != NULL && cipher->gettable_ctx_params != NULL)
         return cipher->gettable_ctx_params();

diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index 3a2d02815306fc04e2e94bd475511ec20092e563..e6185e9255568b4d33affc8f56517d628a35d98a 100644 (file)
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c
@@ -173,14 +173,14 @@ const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf)
     return kdf->gettable_params();
 }
 
     return kdf->gettable_params();
 }
 

-const OSSL_PARAM *EVP_KDF_CTX_gettable_params(const EVP_KDF *kdf)
+const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf)

 {
     if (kdf->gettable_ctx_params == NULL)
         return NULL;
     return kdf->gettable_ctx_params();
 }
 
 {
     if (kdf->gettable_ctx_params == NULL)
         return NULL;
     return kdf->gettable_ctx_params();
 }
 

-const OSSL_PARAM *EVP_KDF_CTX_settable_params(const EVP_KDF *kdf)
+const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf)

 {
     if (kdf->settable_ctx_params == NULL)
         return NULL;
 {
     if (kdf->settable_ctx_params == NULL)
         return NULL;

diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index c01f04ef765173697296996ce9c2254955decbcd..f35c2d157e3e26a5401cc8e89a3e238614a5ad0c 100644 (file)
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -190,14 +190,14 @@ const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac)
     return mac->gettable_params();
 }
 
     return mac->gettable_params();
 }
 

-const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac)
+const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac)

 {
     if (mac->gettable_ctx_params == NULL)
         return NULL;
     return mac->gettable_ctx_params();
 }
 
 {
     if (mac->gettable_ctx_params == NULL)
         return NULL;
     return mac->gettable_ctx_params();
 }
 

-const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac)
+const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac)

 {
     if (mac->settable_ctx_params == NULL)
         return NULL;
 {
     if (mac->settable_ctx_params == NULL)
         return NULL;

diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c
index d57ff6fd472bc46575c1ad92a9ef4a54114ab295..b1337f511a990b8cf7eac8f32addc2164c3e8825 100644 (file)
--- a/crypto/evp/pkey_kdf.c
+++ b/crypto/evp/pkey_kdf.c
@@ -213,7 +213,7 @@ static int pkey_kdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
     EVP_KDF_CTX *kctx = pkctx->kctx;
     const EVP_KDF *kdf = EVP_KDF_CTX_kdf(kctx);
     BUF_MEM **collector = NULL;
     EVP_KDF_CTX *kctx = pkctx->kctx;
     const EVP_KDF *kdf = EVP_KDF_CTX_kdf(kctx);
     BUF_MEM **collector = NULL;

-    const OSSL_PARAM *defs = EVP_KDF_CTX_settable_params(kdf);
+    const OSSL_PARAM *defs = EVP_KDF_settable_ctx_params(kdf);

     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     int ok = 0;
 
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     int ok = 0;
 

diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c
index 005741dd15c4eb519d0d6b81471eefe813987378..1c8f8785122435fb285232eeb731799947d0d456 100644 (file)
--- a/crypto/evp/pkey_mac.c
+++ b/crypto/evp/pkey_mac.c
@@ -452,7 +452,7 @@ static int pkey_mac_ctrl_str(EVP_PKEY_CTX *ctx,
         type = OSSL_MAC_PARAM_SIZE;
 
     if (!OSSL_PARAM_allocate_from_text(&params[0],
         type = OSSL_MAC_PARAM_SIZE;
 
     if (!OSSL_PARAM_allocate_from_text(&params[0],

-                                       EVP_MAC_CTX_settable_params(mac),
+                                       EVP_MAC_settable_ctx_params(mac),

                                        type, value, strlen(value) + 1))
         return 0;
     params[1] = OSSL_PARAM_construct_end();
                                        type, value, strlen(value) + 1))
         return 0;
     params[1] = OSSL_PARAM_construct_end();

diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index a2ccc6f3d66187e8151566ebc5d538d85450bc4e..0f04fe0d91fbd7c72c7ba34dd4e1363141f73b1d 100644 (file)
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -44,9 +44,9 @@ EVP_CIPHER_CTX_cipher,
 EVP_CIPHER_CTX_name,
 EVP_CIPHER_CTX_nid,
 EVP_CIPHER_CTX_get_params,
 EVP_CIPHER_CTX_name,
 EVP_CIPHER_CTX_nid,
 EVP_CIPHER_CTX_get_params,

-EVP_CIPHER_CTX_gettable_params,
+EVP_CIPHER_gettable_ctx_params,

 EVP_CIPHER_CTX_set_params,
 EVP_CIPHER_CTX_set_params,

-EVP_CIPHER_CTX_settable_params,
+EVP_CIPHER_settable_ctx_params,

 EVP_CIPHER_CTX_block_size,
 EVP_CIPHER_CTX_key_length,
 EVP_CIPHER_CTX_iv_length,
 EVP_CIPHER_CTX_block_size,
 EVP_CIPHER_CTX_key_length,
 EVP_CIPHER_CTX_iv_length,


@@ -135,8 +135,8 @@ EVP_CIPHER_do_all_ex
  int EVP_CIPHER_CTX_set_params(EVP_CIPHER_CTX *ctx, const OSSL_PARAM params[]);
  int EVP_CIPHER_CTX_get_params(EVP_CIPHER_CTX *ctx, OSSL_PARAM params[]);
  const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher);
  int EVP_CIPHER_CTX_set_params(EVP_CIPHER_CTX *ctx, const OSSL_PARAM params[]);
  int EVP_CIPHER_CTX_get_params(EVP_CIPHER_CTX *ctx, OSSL_PARAM params[]);
  const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher);

- const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(const EVP_CIPHER *cipher);
- const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(const EVP_CIPHER *cipher);
+ const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher);
+ const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher);

  int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);


@@ -278,8 +278,8 @@ context B<ctx>.
 EVP_CIPHER_CTX_get_params() retrieves the requested list of operation
 B<params> from CIPHER context B<ctx>.
 
 EVP_CIPHER_CTX_get_params() retrieves the requested list of operation
 B<params> from CIPHER context B<ctx>.
 

-EVP_CIPHER_gettable_params(), EVP_CIPHER_CTX_gettable_params(), and
-EVP_CIPHER_CTX_settable_params() get a constant B<OSSL_PARAM> array
+EVP_CIPHER_gettable_params(), EVP_CIPHER_gettable_ctx_params(), and
+EVP_CIPHER_settable_ctx_params() get a constant B<OSSL_PARAM> array

 that decribes the retrievable and settable parameters, i.e. parameters
 that can be used with EVP_CIPHER_get_params(), EVP_CIPHER_CTX_get_params()
 and EVP_CIPHER_CTX_set_params(), respectively.
 that decribes the retrievable and settable parameters, i.e. parameters
 that can be used with EVP_CIPHER_get_params(), EVP_CIPHER_CTX_get_params()
 and EVP_CIPHER_CTX_set_params(), respectively.

diff --git a/doc/man3/EVP_KDF.pod b/doc/man3/EVP_KDF.pod
index 269733123bc336458ab86a8d206a4417a17e003b..e175124ad0089920daef8d8e8f88289aeb54fbb8 100644 (file)
--- a/doc/man3/EVP_KDF.pod
+++ b/doc/man3/EVP_KDF.pod
@@ -7,7 +7,7 @@ EVP_KDF_name,
 EVP_KDF_CTX, EVP_KDF_CTX_new, EVP_KDF_CTX_free, EVP_KDF_CTX_kdf,
 EVP_KDF_reset, EVP_KDF_size, EVP_KDF_derive, EVP_KDF_CTX_dup,
 EVP_KDF_CTX_get_params, EVP_KDF_CTX_set_params, EVP_KDF_do_all_ex,
 EVP_KDF_CTX, EVP_KDF_CTX_new, EVP_KDF_CTX_free, EVP_KDF_CTX_kdf,
 EVP_KDF_reset, EVP_KDF_size, EVP_KDF_derive, EVP_KDF_CTX_dup,
 EVP_KDF_CTX_get_params, EVP_KDF_CTX_set_params, EVP_KDF_do_all_ex,

-EVP_KDF_get_params, EVP_KDF_CTX_gettable_params, EVP_KDF_CTX_settable_params,
+EVP_KDF_get_params, EVP_KDF_gettable_ctx_params, EVP_KDF_settable_ctx_params,

 EVP_KDF_gettable_params - EVP KDF routines
 
 =head1 SYNOPSIS
 EVP_KDF_gettable_params - EVP KDF routines
 
 =head1 SYNOPSIS


@@ -36,8 +36,8 @@ EVP_KDF_gettable_params - EVP KDF routines
  int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]);
  int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]);
  const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf);
  int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]);
  int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]);
  const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf);

- const OSSL_PARAM *EVP_KDF_CTX_gettable_params(const EVP_KDF *kdf);
- const OSSL_PARAM *EVP_KDF_CTX_settable_params(const EVP_KDF *kdf);
+ const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf);
+ const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf);

  const OSSL_PROVIDER *EVP_KDF_provider(const EVP_KDF *kdf);
 
 =head1 DESCRIPTION
  const OSSL_PROVIDER *EVP_KDF_provider(const EVP_KDF *kdf);
 
 =head1 DESCRIPTION


@@ -114,8 +114,8 @@ simply ignored.
 Also, what happens when a needed parameter isn't passed down is
 defined by the implementation.
 
 Also, what happens when a needed parameter isn't passed down is
 defined by the implementation.
 

-EVP_KDF_gettable_params(), EVP_KDF_CTX_gettable_params() and
-EVP_KDF_CTX_settable_params() get a constant B<OSSL_PARAM> array that
+EVP_KDF_gettable_params(), EVP_KDF_gettable_ctx_params() and
+EVP_KDF_settable_ctx_params() get a constant B<OSSL_PARAM> array that

 decribes the retrievable and settable parameters, i.e. parameters that
 can be used with EVP_KDF_get_params(), EVP_KDF_CTX_get_params()
 and EVP_KDF_CTX_set_params(), respectively.
 decribes the retrievable and settable parameters, i.e. parameters that
 can be used with EVP_KDF_get_params(), EVP_KDF_CTX_get_params()
 and EVP_KDF_CTX_set_params(), respectively.

diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod
index b4d5b5bdd8c8a76c09fd3441ffe25e46b551b390..c2087546eac42a108aeac859ad7f77e66e1f3c35 100644 (file)
--- a/doc/man3/EVP_MAC.pod
+++ b/doc/man3/EVP_MAC.pod
@@ -8,7 +8,7 @@ EVP_MAC_provider, EVP_MAC_get_params, EVP_MAC_gettable_params,
 EVP_MAC_CTX, EVP_MAC_CTX_new, EVP_MAC_CTX_free, EVP_MAC_CTX_dup,
 EVP_MAC_CTX_mac, EVP_MAC_CTX_get_params, EVP_MAC_CTX_set_params,
 EVP_MAC_size, EVP_MAC_init, EVP_MAC_update, EVP_MAC_final,
 EVP_MAC_CTX, EVP_MAC_CTX_new, EVP_MAC_CTX_free, EVP_MAC_CTX_dup,
 EVP_MAC_CTX_mac, EVP_MAC_CTX_get_params, EVP_MAC_CTX_set_params,
 EVP_MAC_size, EVP_MAC_init, EVP_MAC_update, EVP_MAC_final,

-EVP_MAC_CTX_gettable_params, EVP_MAC_CTX_settable_params,
+EVP_MAC_gettable_ctx_params, EVP_MAC_settable_ctx_params,

 EVP_MAC_do_all_ex - EVP MAC routines
 
 =head1 SYNOPSIS
 EVP_MAC_do_all_ex - EVP MAC routines
 
 =head1 SYNOPSIS


@@ -41,8 +41,8 @@ EVP_MAC_do_all_ex - EVP MAC routines
                    unsigned char *out, size_t *outl, size_t outsize);
 
  const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);
                    unsigned char *out, size_t *outl, size_t outsize);
 
  const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);

- const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac);
- const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac);
+ const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac);
+ const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac);

 
  void EVP_MAC_do_all_ex(OPENSSL_CTX *libctx,
                         void (*fn)(EVP_MAC *mac, void *arg),
 
  void EVP_MAC_do_all_ex(OPENSSL_CTX *libctx,
                         void (*fn)(EVP_MAC *mac, void *arg),


@@ -146,8 +146,8 @@ simply ignored.
 Also, what happens when a needed parameter isn't passed down is
 defined by the implementation.
 
 Also, what happens when a needed parameter isn't passed down is
 defined by the implementation.
 

-EVP_MAC_gettable_params(), EVP_MAC_CTX_gettable_params() and
-EVP_MAC_CTX_settable_params() get a constant B<OSSL_PARAM> array that
+EVP_MAC_gettable_params(), EVP_MAC_gettable_ctx_params() and
+EVP_MAC_settable_ctx_params() get a constant B<OSSL_PARAM> array that

 decribes the retrievable and settable parameters, i.e. parameters that
 can be used with EVP_MAC_get_params(), EVP_MAC_CTX_get_params()
 and EVP_MAC_CTX_set_params(), respectively.
 decribes the retrievable and settable parameters, i.e. parameters that
 can be used with EVP_MAC_get_params(), EVP_MAC_CTX_get_params()
 and EVP_MAC_CTX_set_params(), respectively.

diff --git a/doc/man3/OSSL_PARAM_construct_from_text.pod b/doc/man3/OSSL_PARAM_construct_from_text.pod
index 6c7ff81ef46560c6b0da375b08d5c1c0a71d633b..75ab58e710db1a6519005b7d59dc922866e86b53 100644 (file)
--- a/doc/man3/OSSL_PARAM_construct_from_text.pod
+++ b/doc/man3/OSSL_PARAM_construct_from_text.pod
@@ -120,7 +120,7 @@ Can be written like this instead:
   OSSL_PARAM *params =
       OPENSSL_zalloc(sizeof(*params)
                      * (sk_OPENSSL_STRING_num(opts) + 1));
   OSSL_PARAM *params =
       OPENSSL_zalloc(sizeof(*params)
                      * (sk_OPENSSL_STRING_num(opts) + 1));

-  const OSSL_PARAM *paramdefs = EVP_MAC_CTX_settable_params(mac);
+  const OSSL_PARAM *paramdefs = EVP_MAC_settable_ctx_params(mac);

   size_t params_n;
   char *opt = "<unknown>";
 
   size_t params_n;
   char *opt = "<unknown>";
 

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 564106ceff8d5592a8641d586c69c9be1084ab4c..407162f3f01ebb9add584463b553c61b5b0e879f 100644 (file)
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -723,8 +723,8 @@ int EVP_CIPHER_get_params(EVP_CIPHER *cipher, OSSL_PARAM params[]);
 int EVP_CIPHER_CTX_set_params(EVP_CIPHER_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_CIPHER_CTX_get_params(EVP_CIPHER_CTX *ctx, OSSL_PARAM params[]);
 const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher);
 int EVP_CIPHER_CTX_set_params(EVP_CIPHER_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_CIPHER_CTX_get_params(EVP_CIPHER_CTX *ctx, OSSL_PARAM params[]);
 const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher);

-const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(const EVP_CIPHER *cipher);
-const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(const EVP_CIPHER *cipher);
+const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher);
+const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher);

 
 const BIO_METHOD *BIO_f_md(void);
 const BIO_METHOD *BIO_f_base64(void);
 
 const BIO_METHOD *BIO_f_md(void);
 const BIO_METHOD *BIO_f_base64(void);


@@ -1060,8 +1060,8 @@ int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen);
 int EVP_MAC_final(EVP_MAC_CTX *ctx,
                   unsigned char *out, size_t *outl, size_t outsize);
 const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);
 int EVP_MAC_final(EVP_MAC_CTX *ctx,
                   unsigned char *out, size_t *outl, size_t outsize);
 const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);

-const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac);
-const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac);
+const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac);
+const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac);

 
 void EVP_MAC_do_all_ex(OPENSSL_CTX *libctx,
                        void (*fn)(EVP_MAC *mac, void *arg),
 
 void EVP_MAC_do_all_ex(OPENSSL_CTX *libctx,
                        void (*fn)(EVP_MAC *mac, void *arg),

diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index 864a5533ac3306cd4bfe30c53f109dd5415a32ac..2193eaeec0f6064d8c7450d4c8a3d2b45530863b 100644 (file)
--- a/include/openssl/kdf.h
+++ b/include/openssl/kdf.h
@@ -44,8 +44,8 @@ int EVP_KDF_get_params(EVP_KDF *kdf, OSSL_PARAM params[]);
 int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]);
 int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]);
 const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf);
 int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]);
 int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]);
 const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf);

-const OSSL_PARAM *EVP_KDF_CTX_gettable_params(const EVP_KDF *kdf);
-const OSSL_PARAM *EVP_KDF_CTX_settable_params(const EVP_KDF *kdf);
+const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf);
+const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf);

 
 void EVP_KDF_do_all_ex(OPENSSL_CTX *libctx,
                        void (*fn)(EVP_KDF *kdf, void *arg),
 
 void EVP_KDF_do_all_ex(OPENSSL_CTX *libctx,
                        void (*fn)(EVP_KDF *kdf, void *arg),

diff --git a/test/evp_test.c b/test/evp_test.c
index 0b5fd5dae3c968d089f44bb177f6f1f413304528..03581ff44756483b859a590a5bcef2f0576d8f05 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1161,7 +1161,7 @@ static int mac_test_run_mac(EVP_TEST *t)
     size_t params_n = 0;
     size_t params_n_allocstart = 0;
     const OSSL_PARAM *defined_params =
     size_t params_n = 0;
     size_t params_n_allocstart = 0;
     const OSSL_PARAM *defined_params =

-        EVP_MAC_CTX_settable_params(expected->mac);
+        EVP_MAC_settable_ctx_params(expected->mac);

 
     if (expected->alg == NULL)
         TEST_info("Trying the EVP_MAC %s test", EVP_MAC_name(expected->mac));
 
     if (expected->alg == NULL)
         TEST_info("Trying the EVP_MAC %s test", EVP_MAC_name(expected->mac));


@@ -2054,7 +2054,7 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
     KDF_DATA *kdata = t->data;
     int rv;
     char *p, *name;
     KDF_DATA *kdata = t->data;
     int rv;
     char *p, *name;

-    const OSSL_PARAM *defs = EVP_KDF_CTX_settable_params(EVP_KDF_CTX_kdf(kctx));
+    const OSSL_PARAM *defs = EVP_KDF_settable_ctx_params(EVP_KDF_CTX_kdf(kctx));

 
     if (!TEST_ptr(name = OPENSSL_strdup(value)))
         return 0;
 
     if (!TEST_ptr(name = OPENSSL_strdup(value)))
         return 0;

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 7c448932f8c7d8b5d3cbb9158fc468f08523eb42..e8d71385aecc6a3988d703140cfa58a8c3c4ca11 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4708,14 +4708,14 @@ EVP_CIPHER_get_params                   4824    3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_params               4825   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_get_params               4826   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_gettable_params              4827   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_params               4825   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_get_params               4826   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_gettable_params              4827   3_0_0   EXIST::FUNCTION:

-EVP_CIPHER_CTX_settable_params          4828   3_0_0   EXIST::FUNCTION:
-EVP_CIPHER_CTX_gettable_params          4829   3_0_0   EXIST::FUNCTION:
+EVP_CIPHER_settable_ctx_params          4828   3_0_0   EXIST::FUNCTION:
+EVP_CIPHER_gettable_ctx_params          4829   3_0_0   EXIST::FUNCTION:

 EVP_MD_get_params                       4830   3_0_0   EXIST::FUNCTION:
 EVP_MAC_fetch                           4831   3_0_0   EXIST::FUNCTION:
 EVP_MD_get_params                       4830   3_0_0   EXIST::FUNCTION:
 EVP_MAC_fetch                           4831   3_0_0   EXIST::FUNCTION:

-EVP_MAC_CTX_settable_params             4832   3_0_0   EXIST::FUNCTION:
+EVP_MAC_settable_ctx_params             4832   3_0_0   EXIST::FUNCTION:

 EVP_MAC_CTX_set_params                  4833   3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_get_params                  4834   3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_set_params                  4833   3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_get_params                  4834   3_0_0   EXIST::FUNCTION:

-EVP_MAC_CTX_gettable_params             4835   3_0_0   EXIST::FUNCTION:
+EVP_MAC_gettable_ctx_params             4835   3_0_0   EXIST::FUNCTION:

 EVP_MAC_free                            4836   3_0_0   EXIST::FUNCTION:
 EVP_MAC_up_ref                          4837   3_0_0   EXIST::FUNCTION:
 EVP_MAC_name                            4838   3_0_0   EXIST::FUNCTION:
 EVP_MAC_free                            4836   3_0_0   EXIST::FUNCTION:
 EVP_MAC_up_ref                          4837   3_0_0   EXIST::FUNCTION:
 EVP_MAC_name                            4838   3_0_0   EXIST::FUNCTION:


@@ -4735,8 +4735,8 @@ EVP_KDF_get_params                      4851      3_0_0   EXIST::FUNCTION:
 EVP_KDF_CTX_get_params                  4852   3_0_0   EXIST::FUNCTION:
 EVP_KDF_CTX_set_params                  4853   3_0_0   EXIST::FUNCTION:
 EVP_KDF_gettable_params                 4854   3_0_0   EXIST::FUNCTION:
 EVP_KDF_CTX_get_params                  4852   3_0_0   EXIST::FUNCTION:
 EVP_KDF_CTX_set_params                  4853   3_0_0   EXIST::FUNCTION:
 EVP_KDF_gettable_params                 4854   3_0_0   EXIST::FUNCTION:

-EVP_KDF_CTX_gettable_params             4855   3_0_0   EXIST::FUNCTION:
-EVP_KDF_CTX_settable_params             4856   3_0_0   EXIST::FUNCTION:
+EVP_KDF_gettable_ctx_params             4855   3_0_0   EXIST::FUNCTION:
+EVP_KDF_settable_ctx_params             4856   3_0_0   EXIST::FUNCTION:

 EVP_KDF_do_all_ex                       4857   3_0_0   EXIST::FUNCTION:
 EVP_SIGNATURE_free                      4858   3_0_0   EXIST::FUNCTION:
 EVP_SIGNATURE_up_ref                    4859   3_0_0   EXIST::FUNCTION:
 EVP_KDF_do_all_ex                       4857   3_0_0   EXIST::FUNCTION:
 EVP_SIGNATURE_free                      4858   3_0_0   EXIST::FUNCTION:
 EVP_SIGNATURE_up_ref                    4859   3_0_0   EXIST::FUNCTION: