diff options
| author | Pauli <paul.dale@oracle.com> | 2020-09-29 17:40:26 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-10-01 10:33:57 +1000 |
| commit | 592dcfd3df129235fa94144e866812800e2941e8 (patch) | |
| tree | 00f6fb59eec3e606e61504af94e992fbc2f086d7 /providers/implementations/ciphers/cipher_chacha20.c | |
| parent | 5b60f9c3e05bfb8c24e6933964b86c738f5ad072 (diff) | |
prov: prefix all exposed 'cipher' symbols with ossl_
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13030)
Diffstat (limited to 'providers/implementations/ciphers/cipher_chacha20.c')
| -rw-r--r-- | providers/implementations/ciphers/cipher_chacha20.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c index 89493c3fbc..8e0727ae47 100644 --- a/providers/implementations/ciphers/cipher_chacha20.c +++ b/providers/implementations/ciphers/cipher_chacha20.c @@ -27,19 +27,19 @@ static OSSL_FUNC_cipher_get_ctx_params_fn chacha20_get_ctx_params; static OSSL_FUNC_cipher_set_ctx_params_fn chacha20_set_ctx_params; static OSSL_FUNC_cipher_gettable_ctx_params_fn chacha20_gettable_ctx_params; static OSSL_FUNC_cipher_settable_ctx_params_fn chacha20_settable_ctx_params; -#define chacha20_cipher cipher_generic_cipher -#define chacha20_update cipher_generic_stream_update -#define chacha20_final cipher_generic_stream_final -#define chacha20_gettable_params cipher_generic_gettable_params +#define chacha20_cipher ossl_cipher_generic_cipher +#define chacha20_update ossl_cipher_generic_stream_update +#define chacha20_final ossl_cipher_generic_stream_final +#define chacha20_gettable_params ossl_cipher_generic_gettable_params void chacha20_initctx(PROV_CHACHA20_CTX *ctx) { - cipher_generic_initkey(ctx, CHACHA20_KEYLEN * 8, - CHACHA20_BLKLEN * 8, - CHACHA20_IVLEN * 8, - 0, CHACHA20_FLAGS, - ossl_prov_cipher_hw_chacha20(CHACHA20_KEYLEN * 8), - NULL); + ossl_cipher_generic_initkey(ctx, CHACHA20_KEYLEN * 8, + CHACHA20_BLKLEN * 8, + CHACHA20_IVLEN * 8, + 0, CHACHA20_FLAGS, + ossl_prov_cipher_hw_chacha20(CHACHA20_KEYLEN * 8), + NULL); } static void *chacha20_newctx(void *provctx) @@ -60,17 +60,17 @@ static void chacha20_freectx(void *vctx) PROV_CHACHA20_CTX *ctx = (PROV_CHACHA20_CTX *)vctx; if (ctx != NULL) { - cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx); + ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx); OPENSSL_clear_free(ctx, sizeof(*ctx)); } } static int chacha20_get_params(OSSL_PARAM params[]) { - return cipher_generic_get_params(params, 0, CHACHA20_FLAGS, - CHACHA20_KEYLEN * 8, - CHACHA20_BLKLEN * 8, - CHACHA20_IVLEN * 8); + return ossl_cipher_generic_get_params(params, 0, CHACHA20_FLAGS, + CHACHA20_KEYLEN * 8, + CHACHA20_BLKLEN * 8, + CHACHA20_IVLEN * 8); } static int chacha20_get_ctx_params(void *vctx, OSSL_PARAM params[]) @@ -147,7 +147,7 @@ int chacha20_einit(void *vctx, const unsigned char *key, size_t keylen, int ret; /* The generic function checks for ossl_prov_is_running() */ - ret= cipher_generic_einit(vctx, key, keylen, iv, ivlen); + ret= ossl_cipher_generic_einit(vctx, key, keylen, iv, ivlen); if (ret && iv != NULL) { PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx; PROV_CIPHER_HW_CHACHA20 *hw = (PROV_CIPHER_HW_CHACHA20 *)ctx->hw; @@ -163,7 +163,7 @@ int chacha20_dinit(void *vctx, const unsigned char *key, size_t keylen, int ret; /* The generic function checks for ossl_prov_is_running() */ - ret= cipher_generic_dinit(vctx, key, keylen, iv, ivlen); + ret= ossl_cipher_generic_dinit(vctx, key, keylen, iv, ivlen); if (ret && iv != NULL) { PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx; PROV_CIPHER_HW_CHACHA20 *hw = (PROV_CIPHER_HW_CHACHA20 *)ctx->hw; |