diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/modes/ofb128.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libcrypto/modes/ofb128.c b/src/lib/libcrypto/modes/ofb128.c index 42afd29d58..8440e7f583 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.7 2023/07/08 14:56:54 beck Exp $ */ | 1 | /* $OpenBSD: ofb128.c,v 1.10 2025/04/23 10:09:08 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 | * |
@@ -49,15 +49,11 @@ | |||
49 | * | 49 | * |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #include <openssl/crypto.h> | ||
53 | #include "modes_local.h" | ||
54 | #include <string.h> | 52 | #include <string.h> |
55 | 53 | ||
56 | #ifndef MODES_DEBUG | 54 | #include <openssl/crypto.h> |
57 | # ifndef NDEBUG | 55 | |
58 | # define NDEBUG | 56 | #include "modes_local.h" |
59 | # endif | ||
60 | #endif | ||
61 | 57 | ||
62 | /* 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 |
63 | * used. The extra state information to record how much of the | 59 | * used. The extra state information to record how much of the |
@@ -74,7 +70,6 @@ CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, | |||
74 | 70 | ||
75 | n = *num; | 71 | n = *num; |
76 | 72 | ||
77 | #if !defined(OPENSSL_SMALL_FOOTPRINT) | ||
78 | if (16 % sizeof(size_t) == 0) | 73 | if (16 % sizeof(size_t) == 0) |
79 | do { /* always true actually */ | 74 | do { /* always true actually */ |
80 | while (n && len) { | 75 | while (n && len) { |
@@ -109,7 +104,6 @@ CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, | |||
109 | return; | 104 | return; |
110 | } while (0); | 105 | } while (0); |
111 | /* the rest would be commonly eliminated by x86* compiler */ | 106 | /* the rest would be commonly eliminated by x86* compiler */ |
112 | #endif | ||
113 | while (l < len) { | 107 | while (l < len) { |
114 | if (n == 0) { | 108 | if (n == 0) { |
115 | (*block)(ivec, ivec, key); | 109 | (*block)(ivec, ivec, key); |