diff options
author | jsing <> | 2024-03-28 12:28:48 +0000 |
---|---|---|
committer | jsing <> | 2024-03-28 12:28:48 +0000 |
commit | 9526f0e84f7b8a3a41429b30c7af10d4b135319a (patch) | |
tree | aa8e7d8faef30663f3f9111528f145fce17003fb /src/lib/libcrypto/aes/aes_cbc.c | |
parent | 47417efb43018f53668a061252fa1164aec412e3 (diff) | |
download | openbsd-9526f0e84f7b8a3a41429b30c7af10d4b135319a.tar.gz openbsd-9526f0e84f7b8a3a41429b30c7af10d4b135319a.tar.bz2 openbsd-9526f0e84f7b8a3a41429b30c7af10d4b135319a.zip |
Make AES_cbc_encrypt() always be a C function.
Rename the assembly generated functions from AES_cbc_encrypt() to
aes_cbc_encrypt_internal(). Always include aes_cbc.c and change it
to use defines that are similar to those used in BN.
ok tb@
Diffstat (limited to 'src/lib/libcrypto/aes/aes_cbc.c')
-rw-r--r-- | src/lib/libcrypto/aes/aes_cbc.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/lib/libcrypto/aes/aes_cbc.c b/src/lib/libcrypto/aes/aes_cbc.c index 5e76f6ea01..f578be9901 100644 --- a/src/lib/libcrypto/aes/aes_cbc.c +++ b/src/lib/libcrypto/aes/aes_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_cbc.c,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */ | 1 | /* $OpenBSD: aes_cbc.c,v 1.13 2024/03/28 12:28:48 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -52,8 +52,13 @@ | |||
52 | #include <openssl/aes.h> | 52 | #include <openssl/aes.h> |
53 | #include <openssl/modes.h> | 53 | #include <openssl/modes.h> |
54 | 54 | ||
55 | void | 55 | #ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL |
56 | AES_cbc_encrypt(const unsigned char *in, unsigned char *out, | 56 | void aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out, |
57 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc); | ||
58 | |||
59 | #else | ||
60 | static inline void | ||
61 | aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out, | ||
57 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc) | 62 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc) |
58 | { | 63 | { |
59 | if (enc) | 64 | if (enc) |
@@ -63,3 +68,11 @@ AES_cbc_encrypt(const unsigned char *in, unsigned char *out, | |||
63 | CRYPTO_cbc128_decrypt(in, out, len, key, ivec, | 68 | CRYPTO_cbc128_decrypt(in, out, len, key, ivec, |
64 | (block128_f)AES_decrypt); | 69 | (block128_f)AES_decrypt); |
65 | } | 70 | } |
71 | #endif | ||
72 | |||
73 | void | ||
74 | AES_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
75 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc) | ||
76 | { | ||
77 | aes_cbc_encrypt_internal(in, out, len, key, ivec, enc); | ||
78 | } | ||