sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-28 03:11:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

[crypto] Fix stray references to AES

Browse Source 
The CBC_CIPHER() macro contains some accidentally hardcoded references
to an underlying AES cipher, instead of using the cipher specified in
the macro parameters.

Fix by using the macro parameter as required.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2024-02-02 17:09:06 +00:00
parent 0cc0f47443
commit 36a27b22b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/ipxe/cbc.h
View File

@@ -77,19 +77,19 @@ static void _cbc_name ## _setiv ( void *ctx, const void *iv, \
size_t ivlen ) { \ size_t ivlen ) { \
struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \ struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \
cbc_setiv ( &_cbc_name ## _ctx->raw_ctx, iv, ivlen, \ cbc_setiv ( &_cbc_name ## _ctx->raw_ctx, iv, ivlen, \
&_raw_cipher, &aes_cbc_ctx->cbc_ctx ); \ &_raw_cipher, &_cbc_name ## _ctx->cbc_ctx ); \
} \ } \
static void _cbc_name ## _encrypt ( void *ctx, const void *src, \ static void _cbc_name ## _encrypt ( void *ctx, const void *src, \
void *dst, size_t len ) { \ void *dst, size_t len ) { \
struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \ struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \
cbc_encrypt ( &_cbc_name ## _ctx->raw_ctx, src, dst, len, \ cbc_encrypt ( &_cbc_name ## _ctx->raw_ctx, src, dst, len, \
&_raw_cipher, &aes_cbc_ctx->cbc_ctx ); \ &_raw_cipher, &_cbc_name ## _ctx->cbc_ctx ); \
} \ } \
static void _cbc_name ## _decrypt ( void *ctx, const void *src, \ static void _cbc_name ## _decrypt ( void *ctx, const void *src, \
void *dst, size_t len ) { \ void *dst, size_t len ) { \
struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \ struct _cbc_name ## _context * _cbc_name ## _ctx = ctx; \
cbc_decrypt ( &_cbc_name ## _ctx->raw_ctx, src, dst, len, \ cbc_decrypt ( &_cbc_name ## _ctx->raw_ctx, src, dst, len, \
&_raw_cipher, &aes_cbc_ctx->cbc_ctx ); \ &_raw_cipher, &_cbc_name ## _ctx->cbc_ctx ); \
} \ } \
struct cipher_algorithm _cbc_cipher = { \ struct cipher_algorithm _cbc_cipher = { \
.name = #_cbc_name, \ .name = #_cbc_name, \