diff options
author | jsing <> | 2025-04-23 10:09:08 +0000 |
---|---|---|
committer | jsing <> | 2025-04-23 10:09:08 +0000 |
commit | 273e048d695a49faad75ca2ffa6e445353142be8 (patch) | |
tree | d1c2ceba5dcba84401a9f27175cd75d24ed0522c /src/lib/libcrypto/modes/cfb128.c | |
parent | fc19b6b60b2fc471fedda6057b5e1e5c20ccb6b8 (diff) | |
download | openbsd-273e048d695a49faad75ca2ffa6e445353142be8.tar.gz openbsd-273e048d695a49faad75ca2ffa6e445353142be8.tar.bz2 openbsd-273e048d695a49faad75ca2ffa6e445353142be8.zip |
Unifdef OPENSSL_SMALL_FOOTPRINT.
We do not build with OPENSSL_SMALL_FOOTPRINT and it removes more untested
code paths.
Request by tb@ (and it was already on my TODO list!)
Diffstat (limited to 'src/lib/libcrypto/modes/cfb128.c')
-rw-r--r-- | src/lib/libcrypto/modes/cfb128.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/modes/cfb128.c b/src/lib/libcrypto/modes/cfb128.c index 4f9dac178d..9a63a46724 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.9 2025/04/21 16:01:18 jsing Exp $ */ | 1 | /* $OpenBSD: cfb128.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 | * |
@@ -71,7 +71,6 @@ CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, | |||
71 | n = *num; | 71 | n = *num; |
72 | 72 | ||
73 | if (enc) { | 73 | if (enc) { |
74 | #if !defined(OPENSSL_SMALL_FOOTPRINT) | ||
75 | if (16 % sizeof(size_t) == 0) | 74 | if (16 % sizeof(size_t) == 0) |
76 | do { /* always true actually */ | 75 | do { /* always true actually */ |
77 | while (n && len) { | 76 | while (n && len) { |
@@ -107,7 +106,6 @@ CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, | |||
107 | return; | 106 | return; |
108 | } while (0); | 107 | } while (0); |
109 | /* the rest would be commonly eliminated by x86* compiler */ | 108 | /* the rest would be commonly eliminated by x86* compiler */ |
110 | #endif | ||
111 | while (l < len) { | 109 | while (l < len) { |
112 | if (n == 0) { | 110 | if (n == 0) { |
113 | (*block)(ivec, ivec, key); | 111 | (*block)(ivec, ivec, key); |
@@ -118,7 +116,6 @@ CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, | |||
118 | } | 116 | } |
119 | *num = n; | 117 | *num = n; |
120 | } else { | 118 | } else { |
121 | #if !defined(OPENSSL_SMALL_FOOTPRINT) | ||
122 | if (16 % sizeof(size_t) == 0) | 119 | if (16 % sizeof(size_t) == 0) |
123 | do { /* always true actually */ | 120 | do { /* always true actually */ |
124 | while (n && len) { | 121 | while (n && len) { |
@@ -159,7 +156,6 @@ CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, | |||
159 | return; | 156 | return; |
160 | } while (0); | 157 | } while (0); |
161 | /* the rest would be commonly eliminated by x86* compiler */ | 158 | /* the rest would be commonly eliminated by x86* compiler */ |
162 | #endif | ||
163 | while (l < len) { | 159 | while (l < len) { |
164 | unsigned char c; | 160 | unsigned char c; |
165 | if (n == 0) { | 161 | if (n == 0) { |