diff options
| author | jsing <> | 2024-08-11 13:02:39 +0000 |
|---|---|---|
| committer | jsing <> | 2024-08-11 13:02:39 +0000 |
| commit | 5dcef2b3ea9eb7ace8ed74c27534785fc0b87130 (patch) | |
| tree | 8b15d049ee9ab57d9d0970062ec6f18bd01c002c /src/lib/libcrypto/aes | |
| parent | 00708c9d312880823361e1bd53af1d7aa9f14fda (diff) | |
| download | openbsd-5dcef2b3ea9eb7ace8ed74c27534785fc0b87130.tar.gz openbsd-5dcef2b3ea9eb7ace8ed74c27534785fc0b87130.tar.bz2 openbsd-5dcef2b3ea9eb7ace8ed74c27534785fc0b87130.zip | |
Provide and use crypto_arch.h.
Provide a per architecture crypto_arch.h - this will be used in a similar
manner to bn_arch.h and will allow for architecture specific #defines and
static inline functions. Move the HAVE_AES_* and HAVE_RC4_* defines here.
ok tb@
Diffstat (limited to 'src/lib/libcrypto/aes')
| -rw-r--r-- | src/lib/libcrypto/aes/aes.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/aes/aes_core.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c index 4d040ea5f7..d36a006360 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.3 2024/03/30 05:14:12 joshua Exp $ */ | 1 | /* $OpenBSD: aes.c,v 1.4 2024/08/11 13:02:39 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 | * |
| @@ -55,6 +55,8 @@ | |||
| 55 | #include <openssl/bio.h> | 55 | #include <openssl/bio.h> |
| 56 | #include <openssl/modes.h> | 56 | #include <openssl/modes.h> |
| 57 | 57 | ||
| 58 | #include "crypto_arch.h" | ||
| 59 | |||
| 58 | static const unsigned char aes_wrap_default_iv[] = { | 60 | static const unsigned char aes_wrap_default_iv[] = { |
| 59 | 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, | 61 | 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, |
| 60 | }; | 62 | }; |
diff --git a/src/lib/libcrypto/aes/aes_core.c b/src/lib/libcrypto/aes/aes_core.c index 335b1dba54..0472d5f4e2 100644 --- a/src/lib/libcrypto/aes/aes_core.c +++ b/src/lib/libcrypto/aes/aes_core.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: aes_core.c,v 1.23 2024/03/30 05:14:12 joshua Exp $ */ | 1 | /* $OpenBSD: aes_core.c,v 1.24 2024/08/11 13:02:39 jsing Exp $ */ |
| 2 | /** | 2 | /** |
| 3 | * rijndael-alg-fst.c | 3 | * rijndael-alg-fst.c |
| 4 | * | 4 | * |
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <openssl/aes.h> | 35 | #include <openssl/aes.h> |
| 36 | 36 | ||
| 37 | #include "aes_local.h" | 37 | #include "aes_local.h" |
| 38 | #include "crypto_arch.h" | ||
| 38 | #include "crypto_internal.h" | 39 | #include "crypto_internal.h" |
| 39 | 40 | ||
| 40 | /* | 41 | /* |
