1 files changed, 29 insertions, 38 deletions

diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c
index 1171a53b74..6a5d03fe99 100644
--- a/src/lib/libcrypto/evp/e_des3.c
+++ b/src/lib/libcrypto/evp/e_des3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_des3.c,v 1.24 2022/09/04 15:45:25 jsing Exp $ */
+/* $OpenBSD: e_des3.c,v 1.25 2022/09/15 07:04:19 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -130,9 +130,6 @@ des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 {
         size_t i, bl;
 
-        if (inl > LONG_MAX)
-                return 0;
-
         bl = ctx->cipher->block_size;
 
         if (inl < bl)
@@ -141,8 +138,9 @@ des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         inl -= bl;
 
         for (i = 0; i <= inl; i += bl)
-        DES_ecb3_encrypt((const_DES_cblock *)(in + i), (DES_cblock *)(out + i),
-            &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, ctx->encrypt);
+                DES_ecb3_encrypt((const_DES_cblock *)(in + i), (DES_cblock *)(out + i),
+                    &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, ctx->encrypt);
+
         return 1;
 }
 
@@ -150,16 +148,15 @@ static int
 des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const unsigned char *in, size_t inl)
 {
-        if (inl > LONG_MAX)
-                return 0;
+        size_t chunk = LONG_MAX & ~0xff;
 
-        while (inl >= EVP_MAXCHUNK) {
-                DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
+        while (inl >= chunk) {
+                DES_ede3_ofb64_encrypt(in, out, (long)chunk,
                     &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
                     (DES_cblock *)ctx->iv, &ctx->num);
-                inl -= EVP_MAXCHUNK;
-                in += EVP_MAXCHUNK;
-                out += EVP_MAXCHUNK;
+                inl -= chunk;
+                in += chunk;
+                out += chunk;
         }
         if (inl)
                 DES_ede3_ofb64_encrypt(in, out, (long)inl,
@@ -173,16 +170,15 @@ static int
 des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const unsigned char *in, size_t inl)
 {
-        if (inl > LONG_MAX)
-                return 0;
+        size_t chunk = LONG_MAX & ~0xff;
 
-        while (inl >= EVP_MAXCHUNK) {
-                DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
+        while (inl >= chunk) {
+                DES_ede3_cbc_encrypt(in, out, (long)chunk,
                     &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
                     (DES_cblock *)ctx->iv, ctx->encrypt);
-                inl -= EVP_MAXCHUNK;
-                in += EVP_MAXCHUNK;
-                out += EVP_MAXCHUNK;
+                inl -= chunk;
+                in += chunk;
+                out += chunk;
         }
         if (inl)
                 DES_ede3_cbc_encrypt(in, out, (long)inl,
@@ -195,16 +191,15 @@ static int
 des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const unsigned char *in, size_t inl)
 {
-        if (inl > LONG_MAX)
-                return 0;
+        size_t chunk = LONG_MAX & ~0xff;
 
-        while (inl >= EVP_MAXCHUNK) {
-                DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
+        while (inl >= chunk) {
+                DES_ede3_cfb64_encrypt(in, out, (long)chunk,
                     &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
                     (DES_cblock *)ctx->iv, &ctx->num, ctx->encrypt);
-                inl -= EVP_MAXCHUNK;
-                in += EVP_MAXCHUNK;
-                out += EVP_MAXCHUNK;
+                inl -= chunk;
+                in += chunk;
+                out += chunk;
         }
         if (inl)
                 DES_ede3_cfb64_encrypt(in, out, (long)inl,
@@ -219,11 +214,8 @@ static int
 des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const unsigned char *in, size_t inl)
 {
-        size_t n;
         unsigned char c[1], d[1];
-
-        if (inl > LONG_MAX)
-                return 0;
+        size_t n;
 
         if (!(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS))
                 inl *= 8;
@@ -244,16 +236,15 @@ static int
 des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const unsigned char *in, size_t inl)
 {
-        if (inl > LONG_MAX)
-                return 0;
+        size_t chunk = LONG_MAX & ~0xff;
 
-        while (inl >= EVP_MAXCHUNK) {
-                DES_ede3_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
+        while (inl >= chunk) {
+                DES_ede3_cfb_encrypt(in, out, 8, (long)chunk,
                     &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
                     (DES_cblock *)ctx->iv, ctx->encrypt);
-                inl -= EVP_MAXCHUNK;
-                in += EVP_MAXCHUNK;
-                out += EVP_MAXCHUNK;
+                inl -= chunk;
+                in += chunk;
+                out += chunk;
         }
         if (inl)
                 DES_ede3_cfb_encrypt(in, out, 8, (long)inl,