diff options
author | jsing <> | 2025-04-21 16:01:18 +0000 |
---|---|---|
committer | jsing <> | 2025-04-21 16:01:18 +0000 |
commit | 7b71790663bf087f295bfd28475a1e55ce684dbd (patch) | |
tree | 6ff427caa3c90bbc692eba5acbd5123acc8ff89b /src | |
parent | 8033e0b834d2176bdec65b9f9dac5c9e14a3a6b7 (diff) | |
download | openbsd-7b71790663bf087f295bfd28475a1e55ce684dbd.tar.gz openbsd-7b71790663bf087f295bfd28475a1e55ce684dbd.tar.bz2 openbsd-7b71790663bf087f295bfd28475a1e55ce684dbd.zip |
Mop up unused MODES_DEBUG.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/modes/cbc128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/ccm128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/cfb128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/ctr128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/gcm128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/ofb128.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/modes/xts128.c | 8 |
7 files changed, 7 insertions, 49 deletions
diff --git a/src/lib/libcrypto/modes/cbc128.c b/src/lib/libcrypto/modes/cbc128.c index a1f17d7ca4..5767533c44 100644 --- a/src/lib/libcrypto/modes/cbc128.c +++ b/src/lib/libcrypto/modes/cbc128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cbc128.c,v 1.9 2025/04/21 15:54:32 jsing Exp $ */ | 1 | /* $OpenBSD: cbc128.c,v 1.10 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,12 +55,6 @@ | |||
55 | 55 | ||
56 | #include "modes_local.h" | 56 | #include "modes_local.h" |
57 | 57 | ||
58 | #ifndef MODES_DEBUG | ||
59 | # ifndef NDEBUG | ||
60 | # define NDEBUG | ||
61 | # endif | ||
62 | #endif | ||
63 | |||
64 | #undef STRICT_ALIGNMENT | 58 | #undef STRICT_ALIGNMENT |
65 | #ifdef __STRICT_ALIGNMENT | 59 | #ifdef __STRICT_ALIGNMENT |
66 | #define STRICT_ALIGNMENT 1 | 60 | #define STRICT_ALIGNMENT 1 |
diff --git a/src/lib/libcrypto/modes/ccm128.c b/src/lib/libcrypto/modes/ccm128.c index 8ea0cba77e..0f592dd9e5 100644 --- a/src/lib/libcrypto/modes/ccm128.c +++ b/src/lib/libcrypto/modes/ccm128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ccm128.c,v 1.9 2025/04/21 15:54:32 jsing Exp $ */ | 1 | /* $OpenBSD: ccm128.c,v 1.10 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -54,12 +54,6 @@ | |||
54 | 54 | ||
55 | #include "modes_local.h" | 55 | #include "modes_local.h" |
56 | 56 | ||
57 | #ifndef MODES_DEBUG | ||
58 | # ifndef NDEBUG | ||
59 | # define NDEBUG | ||
60 | # endif | ||
61 | #endif | ||
62 | |||
63 | /* First you setup M and L parameters and pass the key schedule. | 57 | /* First you setup M and L parameters and pass the key schedule. |
64 | * This is called once per session setup... */ | 58 | * This is called once per session setup... */ |
65 | void | 59 | void |
diff --git a/src/lib/libcrypto/modes/cfb128.c b/src/lib/libcrypto/modes/cfb128.c index e6bacee890..4f9dac178d 100644 --- a/src/lib/libcrypto/modes/cfb128.c +++ b/src/lib/libcrypto/modes/cfb128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cfb128.c,v 1.8 2025/04/21 15:54:32 jsing Exp $ */ | 1 | /* $OpenBSD: cfb128.c,v 1.9 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,12 +55,6 @@ | |||
55 | 55 | ||
56 | #include "modes_local.h" | 56 | #include "modes_local.h" |
57 | 57 | ||
58 | #ifndef MODES_DEBUG | ||
59 | # ifndef NDEBUG | ||
60 | # define NDEBUG | ||
61 | # endif | ||
62 | #endif | ||
63 | |||
64 | /* The input and output encrypted as though 128bit cfb mode is being | 58 | /* The input and output encrypted as though 128bit cfb mode is being |
65 | * used. The extra state information to record how much of the | 59 | * used. The extra state information to record how much of the |
66 | * 128bit block we have used is contained in *num; | 60 | * 128bit block we have used is contained in *num; |
diff --git a/src/lib/libcrypto/modes/ctr128.c b/src/lib/libcrypto/modes/ctr128.c index 37bc68a598..9d1be0757b 100644 --- a/src/lib/libcrypto/modes/ctr128.c +++ b/src/lib/libcrypto/modes/ctr128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ctr128.c,v 1.13 2025/04/21 16:00:14 jsing Exp $ */ | 1 | /* $OpenBSD: ctr128.c,v 1.14 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -56,12 +56,6 @@ | |||
56 | 56 | ||
57 | #include "modes_local.h" | 57 | #include "modes_local.h" |
58 | 58 | ||
59 | #ifndef MODES_DEBUG | ||
60 | # ifndef NDEBUG | ||
61 | # define NDEBUG | ||
62 | # endif | ||
63 | #endif | ||
64 | |||
65 | /* NOTE: the IV/counter CTR mode is big-endian. The code itself | 59 | /* NOTE: the IV/counter CTR mode is big-endian. The code itself |
66 | * is endian-neutral. */ | 60 | * is endian-neutral. */ |
67 | 61 | ||
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c index 6c89bd44b7..7f816b68c4 100644 --- a/src/lib/libcrypto/modes/gcm128.c +++ b/src/lib/libcrypto/modes/gcm128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gcm128.c,v 1.27 2024/09/06 09:57:32 tb Exp $ */ | 1 | /* $OpenBSD: gcm128.c,v 1.28 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -57,12 +57,6 @@ | |||
57 | #include "crypto_internal.h" | 57 | #include "crypto_internal.h" |
58 | #include "modes_local.h" | 58 | #include "modes_local.h" |
59 | 59 | ||
60 | #ifndef MODES_DEBUG | ||
61 | # ifndef NDEBUG | ||
62 | # define NDEBUG | ||
63 | # endif | ||
64 | #endif | ||
65 | |||
66 | #if defined(BSWAP4) && defined(__STRICT_ALIGNMENT) | 60 | #if defined(BSWAP4) && defined(__STRICT_ALIGNMENT) |
67 | /* redefine, because alignment is ensured */ | 61 | /* redefine, because alignment is ensured */ |
68 | #undef GETU32 | 62 | #undef GETU32 |
diff --git a/src/lib/libcrypto/modes/ofb128.c b/src/lib/libcrypto/modes/ofb128.c index d8b3b6b8f4..3f5a6ce110 100644 --- a/src/lib/libcrypto/modes/ofb128.c +++ b/src/lib/libcrypto/modes/ofb128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ofb128.c,v 1.8 2025/04/21 15:54:32 jsing Exp $ */ | 1 | /* $OpenBSD: ofb128.c,v 1.9 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,12 +55,6 @@ | |||
55 | 55 | ||
56 | #include "modes_local.h" | 56 | #include "modes_local.h" |
57 | 57 | ||
58 | #ifndef MODES_DEBUG | ||
59 | # ifndef NDEBUG | ||
60 | # define NDEBUG | ||
61 | # endif | ||
62 | #endif | ||
63 | |||
64 | /* The input and output encrypted as though 128bit ofb mode is being | 58 | /* The input and output encrypted as though 128bit ofb mode is being |
65 | * used. The extra state information to record how much of the | 59 | * used. The extra state information to record how much of the |
66 | * 128bit block we have used is contained in *num; | 60 | * 128bit block we have used is contained in *num; |
diff --git a/src/lib/libcrypto/modes/xts128.c b/src/lib/libcrypto/modes/xts128.c index eb635ef088..789af9ef65 100644 --- a/src/lib/libcrypto/modes/xts128.c +++ b/src/lib/libcrypto/modes/xts128.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: xts128.c,v 1.13 2025/04/21 15:54:32 jsing Exp $ */ | 1 | /* $OpenBSD: xts128.c,v 1.14 2025/04/21 16:01:18 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -55,12 +55,6 @@ | |||
55 | 55 | ||
56 | #include "modes_local.h" | 56 | #include "modes_local.h" |
57 | 57 | ||
58 | #ifndef MODES_DEBUG | ||
59 | # ifndef NDEBUG | ||
60 | # define NDEBUG | ||
61 | # endif | ||
62 | #endif | ||
63 | |||
64 | int | 58 | int |
65 | CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], | 59 | CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], |
66 | const unsigned char *inp, unsigned char *out, | 60 | const unsigned char *inp, unsigned char *out, |