prov: prefix aes-cbc-cts functions with ossl_

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

diff --git a/providers/implementations/ciphers/cipher_aes_cts.h b/providers/implementations/ciphers/cipher_aes_cts.h
index 6b0dfdd2c10e082042feda37124cd36b878f9f9d..37dd3df3292daff7bda9ce0c70a7db951580d37b 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_cts.h
+++ b/providers/implementations/ciphers/cipher_aes_cts.h
@@ -9,8 +9,8 @@
 
 #include "crypto/evp.h"
 
-OSSL_FUNC_cipher_update_fn aes_cbc_cts_block_update;
-OSSL_FUNC_cipher_final_fn aes_cbc_cts_block_final;
+OSSL_FUNC_cipher_update_fn ossl_aes_cbc_cts_block_update;
+OSSL_FUNC_cipher_final_fn ossl_aes_cbc_cts_block_final;
 
-const char *aes_cbc_cts_mode_id2name(unsigned int id);
-int aes_cbc_cts_mode_name2id(const char *name);
+const char *ossl_aes_cbc_cts_mode_id2name(unsigned int id);
+int ossl_aes_cbc_cts_mode_name2id(const char *name);

diff --git a/providers/implementations/ciphers/cipher_aes_cts.inc b/providers/implementations/ciphers/cipher_aes_cts.inc
index 5163f938c471c8d3f736bd522d0425c5ea1eab13..559a7b2bf659de300e687a845054562300dd2137 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_cts.inc
+++ b/providers/implementations/ciphers/cipher_aes_cts.inc
@@ -28,7 +28,7 @@ static int aes_cbc_cts_get_ctx_params(void *vctx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_CTS_MODE);
     if (p != NULL) {
-        const char *name = aes_cbc_cts_mode_id2name(ctx->cts_mode);
+        const char *name = ossl_aes_cbc_cts_mode_id2name(ctx->cts_mode);
 
         if (name == NULL || !OSSL_PARAM_set_utf8_string(p, name)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
@@ -52,7 +52,7 @@ static int aes_cbc_cts_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING)
             goto err;
-        id = aes_cbc_cts_mode_name2id(p->data);
+        id = ossl_aes_cbc_cts_mode_name2id(p->data);
         if (id < 0)
             goto err;
 

diff --git a/providers/implementations/ciphers/cipher_aes_cts_fips.c b/providers/implementations/ciphers/cipher_aes_cts_fips.c
index 81e81ad5f2db6702eb245afd7b13e12f3baeb86b..48d3ea8b0913c38f410b5d7b5c458cafbbb14037 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_cts_fips.c
+++ b/providers/implementations/ciphers/cipher_aes_cts_fips.c
@@ -72,7 +72,7 @@ static CTS_MODE_NAME2ID cts_modes[] =
 #endif
 };
 
-const char *aes_cbc_cts_mode_id2name(unsigned int id)
+const char *ossl_aes_cbc_cts_mode_id2name(unsigned int id)
 {
     size_t i;
 
@@ -83,7 +83,7 @@ const char *aes_cbc_cts_mode_id2name(unsigned int id)
     return NULL;
 }
 
-int aes_cbc_cts_mode_name2id(const char *name)
+int ossl_aes_cbc_cts_mode_name2id(const char *name)
 {
     size_t i;
 
@@ -307,7 +307,7 @@ static size_t cts128_cs2_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
 }
 #endif
 
-int aes_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *outl,
+int ossl_aes_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *outl,
                              size_t outsize, const unsigned char *in,
                              size_t inl)
 {
@@ -360,7 +360,7 @@ int aes_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *outl,
     return 1;
 }
 
-int aes_cbc_cts_block_final(void *vctx, unsigned char *out, size_t *outl,
+int ossl_aes_cbc_cts_block_final(void *vctx, unsigned char *out, size_t *outl,
                             size_t outsize)
 {
     *outl = 0;