summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2025-04-18 13:25:03 +0000
committerjsing <>2025-04-18 13:25:03 +0000
commit2193f32bec03013794c733b3d2d9125f14a1f3f7 (patch)
treebcb7211ba5342fce638b1cc473e0dcc272c2e89f /src
parentfb852c976e7cf5b5de76ef0ee7a6211da68406ad (diff)
downloadopenbsd-2193f32bec03013794c733b3d2d9125f14a1f3f7.tar.gz
openbsd-2193f32bec03013794c733b3d2d9125f14a1f3f7.tar.bz2
openbsd-2193f32bec03013794c733b3d2d9125f14a1f3f7.zip
Fix indentation and line wrapping.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 5c35121399..5c52b6b258 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.60 2025/04/18 13:19:39 jsing Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.61 2025/04/18 13:25:03 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 *
@@ -333,24 +333,22 @@ aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
333 EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data; 333 EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
334 334
335 mode = ctx->cipher->flags & EVP_CIPH_MODE; 335 mode = ctx->cipher->flags & EVP_CIPH_MODE;
336 if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) && 336
337 !enc) { 337 if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) && !enc) {
338 ret = AES_set_decrypt_key(key, ctx->key_len * 8, 338 ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks);
339 &dat->ks); 339 dat->block = (block128_f)AES_decrypt;
340 dat->block = (block128_f)AES_decrypt; 340 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
341 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? 341 (cbc128_f)AES_cbc_encrypt : NULL;
342 (cbc128_f)AES_cbc_encrypt : NULL; 342 } else {
343 } else { 343 ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
344 ret = AES_set_encrypt_key(key, ctx->key_len * 8, 344 dat->block = (block128_f)AES_encrypt;
345 &dat->ks); 345 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
346 dat->block = (block128_f)AES_encrypt; 346 (cbc128_f)AES_cbc_encrypt : NULL;
347 dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
348 (cbc128_f)AES_cbc_encrypt : NULL;
349#ifdef AES_CTR_ASM 347#ifdef AES_CTR_ASM
350 if (mode == EVP_CIPH_CTR_MODE) 348 if (mode == EVP_CIPH_CTR_MODE)
351 dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt; 349 dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
352#endif 350#endif
353 } 351 }
354 352
355 if (ret < 0) { 353 if (ret < 0) {
356 EVPerror(EVP_R_AES_KEY_SETUP_FAILED); 354 EVPerror(EVP_R_AES_KEY_SETUP_FAILED);