3 files changed, 7 insertions, 15 deletions

diff --git a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
index 8d33896e1c..42aa20701b 100644
--- a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.10 2016/05/03 12:38:53 tedu Exp $ */
+/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.11 2016/05/04 14:53:29 tedu Exp $ */
 /* ====================================================================
  * Copyright (c) 2011-2013 The OpenSSL Project.  All rights reserved.
  *
@@ -60,7 +60,6 @@
 #include <openssl/aes.h>
 #include <openssl/sha.h>
 #include "evp_locl.h"
-#include "constant_time_locl.h"
 
 #ifndef EVP_CIPH_FLAG_AEAD_CIPHER
 #define EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
@@ -283,8 +282,6 @@ aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         maxpad |= (255 - maxpad) >> (sizeof(maxpad) * 8 - 8);
                         maxpad &= 255;
 
-                        ret &= constant_time_ge(maxpad, pad);
-
                         inp_len = len - (SHA_DIGEST_LENGTH + pad + 1);
                         mask = (0 - ((inp_len - len) >>
                             (sizeof(inp_len) * 8 - 1)));
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
index e4104173d4..637870cef6 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/encode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: encode.c,v 1.22 2016/05/03 14:05:41 bcook Exp $ */
+/* $OpenBSD: encode.c,v 1.23 2016/05/04 14:53:29 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -125,13 +125,13 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
     const unsigned char *in, int inl)
 {
         int i, j;
-        size_t total = 0;
+        unsigned int total = 0;
 
         *outl = 0;
         if (inl == 0)
                 return;
         OPENSSL_assert(ctx->length <= (int)sizeof(ctx->enc_data));
-        if (ctx->length - ctx->num > inl) {
+        if ((ctx->num + inl) < ctx->length) {
                 memcpy(&(ctx->enc_data[ctx->num]), in, inl);
                 ctx->num += inl;
                 return;
@@ -148,7 +148,7 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                 *out = '\0';
                 total = j + 1;
         }
-        while (inl >= ctx->length && total <= INT_MAX) {
+        while (inl >= ctx->length) {
                 j = EVP_EncodeBlock(out, in, ctx->length);
                 in += ctx->length;
                 inl -= ctx->length;
@@ -157,11 +157,6 @@ EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                 *out = '\0';
                 total += j + 1;
         }
-        if (total > INT_MAX) {
-                /* Too much output data! */
-                *outl = 0;
-                return;
-        }
         if (inl != 0)
                 memcpy(&(ctx->enc_data[0]), in, inl);
         ctx->num = inl;
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index 30941ed83d..a4e369f622 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.28 2016/05/03 12:38:53 tedu Exp $ */
+/* $OpenBSD: evp_enc.c,v 1.29 2016/05/04 14:53:29 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -334,7 +334,7 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
                 return 0;
         }
         if (i != 0) {
-                if (bl - i > inl) {
+                if (i + inl < bl) {
                         memcpy(&(ctx->buf[i]), in, inl);
                         ctx->buf_len += inl;
                         *outl = 0;