QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 22:19:40 +00:00
Code Issues Projects Releases Wiki Activity

prov: prefix aes-cbc-cts functions with ossl_

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13030)
This commit is contained in:
Pauli 2020-09-29 16:40:58 +10:00
parent 13a574d8bb
commit 5b60f9c3e0
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/implementations/ciphers/cipher_aes_cts.h
View File

@ -9,8 +9,8 @@
#include "crypto/evp.h" #include "crypto/evp.h"
OSSL_FUNC_cipher_update_fn aes_cbc_cts_block_update; OSSL_FUNC_cipher_update_fn ossl_aes_cbc_cts_block_update;
OSSL_FUNC_cipher_final_fn aes_cbc_cts_block_final; OSSL_FUNC_cipher_final_fn ossl_aes_cbc_cts_block_final;
const char *aes_cbc_cts_mode_id2name(unsigned int id); const char *ossl_aes_cbc_cts_mode_id2name(unsigned int id);
int aes_cbc_cts_mode_name2id(const char *name); int ossl_aes_cbc_cts_mode_name2id(const char *name);

4
providers/implementations/ciphers/cipher_aes_cts.inc
View File

@ -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); p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_CTS_MODE);
if (p != NULL) { 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)) { if (name == NULL || !OSSL_PARAM_set_utf8_string(p, name)) {
ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); 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 != NULL) {
if (p->data_type != OSSL_PARAM_UTF8_STRING) if (p->data_type != OSSL_PARAM_UTF8_STRING)
goto err; goto err;
id = aes_cbc_cts_mode_name2id(p->data); id = ossl_aes_cbc_cts_mode_name2id(p->data);
if (id < 0) if (id < 0)
goto err; goto err;

8
providers/implementations/ciphers/cipher_aes_cts_fips.c
View File

@ -72,7 +72,7 @@ static CTS_MODE_NAME2ID cts_modes[] =
#endif #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; size_t i;
@ -83,7 +83,7 @@ const char *aes_cbc_cts_mode_id2name(unsigned int id)
return NULL; return NULL;
} }
int aes_cbc_cts_mode_name2id(const char *name) int ossl_aes_cbc_cts_mode_name2id(const char *name)
{ {
size_t i; size_t i;
@ -307,7 +307,7 @@ static size_t cts128_cs2_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
} }
#endif #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 outsize, const unsigned char *in,
size_t inl) size_t inl)
{ {
@ -360,7 +360,7 @@ int aes_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *outl,
return 1; 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) size_t outsize)
{ {
*outl = 0; *outl = 0;