diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-09-12 18:54:53 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-09-13 13:17:12 +0200 |
| commit | 1222f37c3693900dcde4dfd13fbd5006b7a54668 (patch) | |
| tree | 0f56548aa575e39603d43a7aa1659ccdc89cb06d | |
| parent | a1c0a2043f0e150516c94ecac8e87e8ce1b2addb (diff) | |
Revert "implement dupctx for chacha20_poly1305"
This reverts commit 603b4c332f817cfc14a0d8b30d1e5a198f575644.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22081)
| -rw-r--r-- | providers/implementations/ciphers/cipher_chacha20_poly1305.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c index 2b271b1d94..abe670add7 100644 --- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c +++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c @@ -23,7 +23,6 @@ static OSSL_FUNC_cipher_newctx_fn chacha20_poly1305_newctx; static OSSL_FUNC_cipher_freectx_fn chacha20_poly1305_freectx; -static OSSL_FUNC_cipher_dupctx_fn chacha20_poly1305_dupctx; static OSSL_FUNC_cipher_encrypt_init_fn chacha20_poly1305_einit; static OSSL_FUNC_cipher_decrypt_init_fn chacha20_poly1305_dinit; static OSSL_FUNC_cipher_get_params_fn chacha20_poly1305_get_params; @@ -59,25 +58,6 @@ static void *chacha20_poly1305_newctx(void *provctx) return ctx; } -static void *chacha20_poly1305_dupctx(void *provctx) -{ - PROV_CHACHA20_POLY1305_CTX *ctx = provctx; - PROV_CHACHA20_POLY1305_CTX *dctx = NULL; - - if (ctx == NULL) - return NULL; - dctx = OPENSSL_memdup(ctx, sizeof(*ctx)); - if (dctx != NULL && dctx->base.tlsmac != NULL && dctx->base.alloced) { - dctx->base.tlsmac = OPENSSL_memdup(dctx->base.tlsmac, - dctx->base.tlsmacsize); - if (dctx->base.tlsmac == NULL) { - OPENSSL_free(dctx); - dctx = NULL; - } - } - return dctx; -} - static void chacha20_poly1305_freectx(void *vctx) { PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)vctx; @@ -330,7 +310,6 @@ static int chacha20_poly1305_final(void *vctx, unsigned char *out, size_t *outl, const OSSL_DISPATCH ossl_chacha20_ossl_poly1305_functions[] = { { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))chacha20_poly1305_newctx }, { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))chacha20_poly1305_freectx }, - { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))chacha20_poly1305_dupctx }, { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))chacha20_poly1305_einit }, { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))chacha20_poly1305_dinit }, { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))chacha20_poly1305_update }, |