diff options
author | jsing <> | 2025-07-22 09:29:31 +0000 |
---|---|---|
committer | jsing <> | 2025-07-22 09:29:31 +0000 |
commit | bac3e025d0e76adcdafc8b26a67bf5a0a4abbed6 (patch) | |
tree | 651b72b7850bc9998617d3adacbd7b1f2af7af21 /src/lib/libcrypto/evp/e_aes.c | |
parent | cbc4928ebdbd9c244a1c0e3c2e90497a0d246b38 (diff) | |
download | openbsd-bac3e025d0e76adcdafc8b26a67bf5a0a4abbed6.tar.gz openbsd-bac3e025d0e76adcdafc8b26a67bf5a0a4abbed6.tar.bz2 openbsd-bac3e025d0e76adcdafc8b26a67bf5a0a4abbed6.zip |
Remove remaining block128_f casts from EVP AES.
Use aes_encrypt_block128() instead of AES_encrypt(), avoiding risky casts.
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
-rw-r--r-- | src/lib/libcrypto/evp/e_aes.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index 005f1c49b2..63c9f9654c 100644 --- a/src/lib/libcrypto/evp/e_aes.c +++ b/src/lib/libcrypto/evp/e_aes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: e_aes.c,v 1.81 2025/07/22 09:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: e_aes.c,v 1.82 2025/07/22 09:29:31 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -818,7 +818,7 @@ aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
818 | return 1; | 818 | return 1; |
819 | if (key) { | 819 | if (key) { |
820 | AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); | 820 | AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); |
821 | CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt); | 821 | CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, aes_encrypt_block128); |
822 | 822 | ||
823 | /* If we have an iv can set it directly, otherwise use | 823 | /* If we have an iv can set it directly, otherwise use |
824 | * saved IV. | 824 | * saved IV. |
@@ -1229,7 +1229,7 @@ aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
1229 | if (key) { | 1229 | if (key) { |
1230 | AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); | 1230 | AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); |
1231 | CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, | 1231 | CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, |
1232 | &cctx->ks, (block128_f)AES_encrypt); | 1232 | &cctx->ks, aes_encrypt_block128); |
1233 | cctx->key_set = 1; | 1233 | cctx->key_set = 1; |
1234 | } | 1234 | } |
1235 | if (iv) { | 1235 | if (iv) { |
@@ -1402,7 +1402,7 @@ aead_aes_gcm_init(EVP_AEAD_CTX *ctx, const unsigned char *key, size_t key_len, | |||
1402 | return 0; | 1402 | return 0; |
1403 | 1403 | ||
1404 | AES_set_encrypt_key(key, key_bits, &gcm_ctx->ks.ks); | 1404 | AES_set_encrypt_key(key, key_bits, &gcm_ctx->ks.ks); |
1405 | CRYPTO_gcm128_init(&gcm_ctx->gcm, &gcm_ctx->ks.ks, (block128_f)AES_encrypt); | 1405 | CRYPTO_gcm128_init(&gcm_ctx->gcm, &gcm_ctx->ks.ks, aes_encrypt_block128); |
1406 | gcm_ctx->tag_len = tag_len; | 1406 | gcm_ctx->tag_len = tag_len; |
1407 | ctx->aead_state = gcm_ctx; | 1407 | ctx->aead_state = gcm_ctx; |
1408 | 1408 | ||