summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/aes
diff options
context:
space:
mode:
authorjsing <>2024-03-28 12:52:58 +0000
committerjsing <>2024-03-28 12:52:58 +0000
commit160c61a34bd287854cf967205877adf7a0b5b7c0 (patch)
treea6778cbc84eea86eed062108ab72df9aca9bb92c /src/lib/libcrypto/aes
parent9526f0e84f7b8a3a41429b30c7af10d4b135319a (diff)
downloadopenbsd-160c61a34bd287854cf967205877adf7a0b5b7c0.tar.gz
openbsd-160c61a34bd287854cf967205877adf7a0b5b7c0.tar.bz2
openbsd-160c61a34bd287854cf967205877adf7a0b5b7c0.zip
Merge aes_cbc.c into aes.c now that aes_cbc.c is used on all platforms.
Diffstat (limited to 'src/lib/libcrypto/aes')
-rw-r--r--src/lib/libcrypto/aes/aes.c27
-rw-r--r--src/lib/libcrypto/aes/aes_cbc.c78
2 files changed, 26 insertions, 79 deletions
diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c
index d3bf85947d..9b25a21f4c 100644
--- a/src/lib/libcrypto/aes/aes.c
+++ b/src/lib/libcrypto/aes/aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: aes.c,v 1.1 2024/03/28 00:57:26 jsing Exp $ */ 1/* $OpenBSD: aes.c,v 1.2 2024/03/28 12:52:58 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -59,6 +59,31 @@ static const unsigned char aes_wrap_default_iv[] = {
59 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 59 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
60}; 60};
61 61
62#ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL
63void aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out,
64 size_t len, const AES_KEY *key, unsigned char *ivec, const int enc);
65
66#else
67static inline void
68aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out,
69 size_t len, const AES_KEY *key, unsigned char *ivec, const int enc)
70{
71 if (enc)
72 CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
73 (block128_f)AES_encrypt);
74 else
75 CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
76 (block128_f)AES_decrypt);
77}
78#endif
79
80void
81AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
82 size_t len, const AES_KEY *key, unsigned char *ivec, const int enc)
83{
84 aes_cbc_encrypt_internal(in, out, len, key, ivec, enc);
85}
86
62/* 87/*
63 * The input and output encrypted as though 128bit cfb mode is being 88 * The input and output encrypted as though 128bit cfb mode is being
64 * used. The extra state information to record how much of the 89 * used. The extra state information to record how much of the
diff --git a/src/lib/libcrypto/aes/aes_cbc.c b/src/lib/libcrypto/aes/aes_cbc.c
deleted file mode 100644
index f578be9901..0000000000
--- a/src/lib/libcrypto/aes/aes_cbc.c
+++ /dev/null
@@ -1,78 +0,0 @@
1/* $OpenBSD: aes_cbc.c,v 1.13 2024/03/28 12:28:48 jsing Exp $ */
2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in
14 * the documentation and/or other materials provided with the
15 * distribution.
16 *
17 * 3. All advertising materials mentioning features or use of this
18 * software must display the following acknowledgment:
19 * "This product includes software developed by the OpenSSL Project
20 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
21 *
22 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23 * endorse or promote products derived from this software without
24 * prior written permission. For written permission, please contact
25 * openssl-core@openssl.org.
26 *
27 * 5. Products derived from this software may not be called "OpenSSL"
28 * nor may "OpenSSL" appear in their names without prior written
29 * permission of the OpenSSL Project.
30 *
31 * 6. Redistributions of any form whatsoever must retain the following
32 * acknowledgment:
33 * "This product includes software developed by the OpenSSL Project
34 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
35 *
36 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47 * OF THE POSSIBILITY OF SUCH DAMAGE.
48 * ====================================================================
49 *
50 */
51
52#include <openssl/aes.h>
53#include <openssl/modes.h>
54
55#ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL
56void 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
60static inline void
61aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out,
62 size_t len, const AES_KEY *key, unsigned char *ivec, const int enc)
63{
64 if (enc)
65 CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
66 (block128_f)AES_encrypt);
67 else
68 CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
69 (block128_f)AES_decrypt);
70}
71#endif
72
73void
74AES_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}