From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 27 Feb 2003 14:07:59 +0000 (+0000)
Subject: Encryption BIOs misbehave when used with non blocking I/O.
X-Git-Tag: BEN_FIPS_TEST_1~38^2~270
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b8dc9693a73bb96688c3e8eaac232fc5b2393609;p=oweals%2Fopenssl.git

Encryption BIOs misbehave when used with non blocking I/O.

Two fixes:

1. If BIO_write() fails inside enc_write() it should return the
   total number of bytes successfully written.

2. If BIO_write() fails during BIO_flush() it should return immediately
   with the error code: previously it would fall through to the final
   encrypt, corrupting the buffer.
---

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 510e1bc8a4..ab81851503 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -271,7 +271,7 @@ static int enc_write(BIO *b, const char *in, int inl)
 			if (i <= 0)
 				{
 				BIO_copy_next_retry(b);
-				return(i);
+				return (ret == inl) ? i : ret - inl;
 				}
 			n-=i;
 			ctx->buf_off+=i;
@@ -325,10 +325,7 @@ again:
 			{
 			i=enc_write(b,NULL,0);
 			if (i < 0)
-				{
-				ret=i;
-				break;
-				}
+				return i;
 			}
 
 		if (!ctx->finished)