diff options
Diffstat (limited to 'src/lib/libcrypto/modes/cbc128.c')
-rw-r--r-- | src/lib/libcrypto/modes/cbc128.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/modes/cbc128.c b/src/lib/libcrypto/modes/cbc128.c index 5767533c44..1b6858ee25 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.10 2025/04/21 16:01:18 jsing Exp $ */ | 1 | /* $OpenBSD: cbc128.c,v 1.11 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 | * |
@@ -70,7 +70,6 @@ CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out, | |||
70 | size_t n; | 70 | size_t n; |
71 | const unsigned char *iv = ivec; | 71 | const unsigned char *iv = ivec; |
72 | 72 | ||
73 | #if !defined(OPENSSL_SMALL_FOOTPRINT) | ||
74 | if (STRICT_ALIGNMENT && | 73 | if (STRICT_ALIGNMENT && |
75 | ((size_t)in|(size_t)out|(size_t)ivec) % sizeof(size_t) != 0) { | 74 | ((size_t)in|(size_t)out|(size_t)ivec) % sizeof(size_t) != 0) { |
76 | while (len >= 16) { | 75 | while (len >= 16) { |
@@ -94,7 +93,6 @@ CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out, | |||
94 | out += 16; | 93 | out += 16; |
95 | } | 94 | } |
96 | } | 95 | } |
97 | #endif | ||
98 | while (len) { | 96 | while (len) { |
99 | for (n = 0; n < 16 && n < len; ++n) | 97 | for (n = 0; n < 16 && n < len; ++n) |
100 | out[n] = in[n] ^ iv[n]; | 98 | out[n] = in[n] ^ iv[n]; |
@@ -123,7 +121,6 @@ CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out, | |||
123 | unsigned char c[16]; | 121 | unsigned char c[16]; |
124 | } tmp; | 122 | } tmp; |
125 | 123 | ||
126 | #if !defined(OPENSSL_SMALL_FOOTPRINT) | ||
127 | if (in != out) { | 124 | if (in != out) { |
128 | const unsigned char *iv = ivec; | 125 | const unsigned char *iv = ivec; |
129 | 126 | ||
@@ -188,7 +185,6 @@ CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out, | |||
188 | } | 185 | } |
189 | } | 186 | } |
190 | } | 187 | } |
191 | #endif | ||
192 | while (len) { | 188 | while (len) { |
193 | unsigned char c; | 189 | unsigned char c; |
194 | (*block)(in, tmp.c, key); | 190 | (*block)(in, tmp.c, key); |