diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-09-12 18:54:55 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-09-13 13:17:12 +0200 |
commit | d74ef8d89c408d419e41edb877e984d4052250c6 (patch) | |
tree | 32fe26aff049c85a5f6a96a19af70be903bb7d5b | |
parent | 78732d8b21f5ee1dd4f5b017d33f0066804d35fb (diff) |
Revert "Add dupctx support to aead ciphers"
This reverts commit a982016c56f8c631e0906b0a33f4feaf3d20a2ff.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22081)
7 files changed, 0 insertions, 70 deletions
diff --git a/providers/implementations/ciphers/cipher_aes_ccm.c b/providers/implementations/ciphers/cipher_aes_ccm.c index 3930f52d60..bb4b1e1e64 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm.c +++ b/providers/implementations/ciphers/cipher_aes_ccm.c @@ -33,26 +33,6 @@ static void *aes_ccm_newctx(void *provctx, size_t keybits) return ctx; } -static void *aes_ccm_dupctx(void *provctx) -{ - PROV_AES_CCM_CTX *ctx = provctx; - PROV_AES_CCM_CTX *dupctx = NULL; - - if (ctx == NULL) - return NULL; - dupctx = OPENSSL_memdup(provctx, sizeof(*ctx)); - if (dupctx == NULL) - return NULL; - /* - * ossl_cm_initctx, via the ossl_prov_aes_hw_ccm functions assign a - * provctx->ccm.ks.ks to the ccm context key so we need to point it to - * the memduped copy - */ - dupctx->base.ccm_ctx.key = &dupctx->ccm.ks.ks; - - return dupctx; -} - static OSSL_FUNC_cipher_freectx_fn aes_ccm_freectx; static void aes_ccm_freectx(void *vctx) { diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c index 0a15693cc1..0081ca6cd7 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.c +++ b/providers/implementations/ciphers/cipher_aes_gcm.c @@ -34,15 +34,6 @@ static void *aes_gcm_newctx(void *provctx, size_t keybits) return ctx; } -static void *aes_gcm_dupctx(void *provctx) -{ - PROV_AES_GCM_CTX *ctx = provctx; - - if (ctx == NULL) - return NULL; - return OPENSSL_memdup(ctx, sizeof(*ctx)); -} - static OSSL_FUNC_cipher_freectx_fn aes_gcm_freectx; static void aes_gcm_freectx(void *vctx) { diff --git a/providers/implementations/ciphers/cipher_aria_ccm.c b/providers/implementations/ciphers/cipher_aria_ccm.c index 39a96a6f14..d6b5517ee0 100644 --- a/providers/implementations/ciphers/cipher_aria_ccm.c +++ b/providers/implementations/ciphers/cipher_aria_ccm.c @@ -28,15 +28,6 @@ static void *aria_ccm_newctx(void *provctx, size_t keybits) return ctx; } -static void *aria_ccm_dupctx(void *provctx) -{ - PROV_ARIA_CCM_CTX *ctx = provctx; - - if (ctx == NULL) - return NULL; - return OPENSSL_memdup(ctx, sizeof(*ctx)); -} - static void aria_ccm_freectx(void *vctx) { PROV_ARIA_CCM_CTX *ctx = (PROV_ARIA_CCM_CTX *)vctx; diff --git a/providers/implementations/ciphers/cipher_aria_gcm.c b/providers/implementations/ciphers/cipher_aria_gcm.c index 6ffa0910fa..b412bd3202 100644 --- a/providers/implementations/ciphers/cipher_aria_gcm.c +++ b/providers/implementations/ciphers/cipher_aria_gcm.c @@ -27,15 +27,6 @@ static void *aria_gcm_newctx(void *provctx, size_t keybits) return ctx; } -static void *aria_gcm_dupctx(void *provctx) -{ - PROV_ARIA_GCM_CTX *ctx = provctx; - - if (ctx == NULL) - return NULL; - return OPENSSL_memdup(ctx, sizeof(*ctx)); -} - static OSSL_FUNC_cipher_freectx_fn aria_gcm_freectx; static void aria_gcm_freectx(void *vctx) { diff --git a/providers/implementations/ciphers/cipher_sm4_ccm.c b/providers/implementations/ciphers/cipher_sm4_ccm.c index fa4b216a02..38e75016e9 100644 --- a/providers/implementations/ciphers/cipher_sm4_ccm.c +++ b/providers/implementations/ciphers/cipher_sm4_ccm.c @@ -28,15 +28,6 @@ static void *sm4_ccm_newctx(void *provctx, size_t keybits) return ctx; } -static void *sm4_ccm_dupctx(void *provctx) -{ - PROV_SM4_CCM_CTX *ctx = provctx; - - if (ctx == NULL) - return NULL; - return OPENSSL_memdup(ctx, sizeof(*ctx)); -} - static void sm4_ccm_freectx(void *vctx) { PROV_SM4_CCM_CTX *ctx = (PROV_SM4_CCM_CTX *)vctx; diff --git a/providers/implementations/ciphers/cipher_sm4_gcm.c b/providers/implementations/ciphers/cipher_sm4_gcm.c index 88761a30f0..ce1aa2b07d 100644 --- a/providers/implementations/ciphers/cipher_sm4_gcm.c +++ b/providers/implementations/ciphers/cipher_sm4_gcm.c @@ -29,15 +29,6 @@ static void *sm4_gcm_newctx(void *provctx, size_t keybits) return ctx; } -static void *sm4_gcm_dupctx(void *provctx) -{ - PROV_SM4_GCM_CTX *ctx = provctx; - - if (ctx == NULL) - return NULL; - return OPENSSL_memdup(ctx, sizeof(*ctx)); -} - static void sm4_gcm_freectx(void *vctx) { PROV_SM4_GCM_CTX *ctx = (PROV_SM4_GCM_CTX *)vctx; diff --git a/providers/implementations/include/prov/ciphercommon_aead.h b/providers/implementations/include/prov/ciphercommon_aead.h index de3dd52ee7..1d017175d3 100644 --- a/providers/implementations/include/prov/ciphercommon_aead.h +++ b/providers/implementations/include/prov/ciphercommon_aead.h @@ -23,14 +23,9 @@ static void * alg##kbits##lc##_newctx(void *provctx) \ { \ return alg##_##lc##_newctx(provctx, kbits); \ } \ -static void * alg##kbits##lc##_dupctx(void *src) \ -{ \ - return alg##_##lc##_dupctx(src); \ -} \ const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx }, \ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx }, \ - { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##kbits##lc##_dupctx }, \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_##lc##_einit }, \ { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_##lc##_dinit }, \ { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_##lc##_stream_update }, \ |