diff options
author | tb <> | 2025-01-25 17:59:44 +0000 |
---|---|---|
committer | tb <> | 2025-01-25 17:59:44 +0000 |
commit | 5482f7f31863bd209e2f594c751ead79f03aa62e (patch) | |
tree | 7454d675702b66e09c692528e45834a172db95ff /src/lib/libcrypto/aes | |
parent | 538936a6c977803d4e15c8449c956ab3c5d69d86 (diff) | |
download | openbsd-5482f7f31863bd209e2f594c751ead79f03aa62e.tar.gz openbsd-5482f7f31863bd209e2f594c751ead79f03aa62e.tar.bz2 openbsd-5482f7f31863bd209e2f594c751ead79f03aa62e.zip |
Remove #error if OPENSSL_NO_FOO is defined
discussed with jsing
Diffstat (limited to 'src/lib/libcrypto/aes')
-rw-r--r-- | src/lib/libcrypto/aes/aes.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_local.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/aes/aes.h b/src/lib/libcrypto/aes/aes.h index 702873e11c..8903a8ef8d 100644 --- a/src/lib/libcrypto/aes/aes.h +++ b/src/lib/libcrypto/aes/aes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes.h,v 1.15 2023/07/31 05:04:06 tb Exp $ */ | 1 | /* $OpenBSD: aes.h,v 1.16 2025/01/25 17:59:44 tb 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 | * |
@@ -54,10 +54,6 @@ | |||
54 | 54 | ||
55 | #include <openssl/opensslconf.h> | 55 | #include <openssl/opensslconf.h> |
56 | 56 | ||
57 | #ifdef OPENSSL_NO_AES | ||
58 | #error AES is disabled. | ||
59 | #endif | ||
60 | |||
61 | #include <stddef.h> | 57 | #include <stddef.h> |
62 | 58 | ||
63 | #define AES_ENCRYPT 1 | 59 | #define AES_ENCRYPT 1 |
diff --git a/src/lib/libcrypto/aes/aes_local.h b/src/lib/libcrypto/aes/aes_local.h index 3f134408c9..e0714df409 100644 --- a/src/lib/libcrypto/aes/aes_local.h +++ b/src/lib/libcrypto/aes/aes_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_local.h,v 1.3 2024/03/27 11:15:44 jsing Exp $ */ | 1 | /* $OpenBSD: aes_local.h,v 1.4 2025/01/25 17:59:44 tb 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 | * |
@@ -54,10 +54,6 @@ | |||
54 | 54 | ||
55 | #include <openssl/opensslconf.h> | 55 | #include <openssl/opensslconf.h> |
56 | 56 | ||
57 | #ifdef OPENSSL_NO_AES | ||
58 | #error AES is disabled. | ||
59 | #endif | ||
60 | |||
61 | #include <stdio.h> | 57 | #include <stdio.h> |
62 | #include <stdlib.h> | 58 | #include <stdlib.h> |
63 | #include <string.h> | 59 | #include <string.h> |