From: Ulf Möller <ulf@openssl.org>
Date: Sat, 14 Aug 1999 20:49:37 +0000 (+0000)
Subject: Undo base64 decoding change (was not a bug fix).
X-Git-Tag: OpenSSL_0_9_5beta1~575
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=364836ca1cfb86815b0f9b8d29b68d74e0059bfc

Undo base64 decoding change (was not a bug fix).
---

diff --git a/STATUS b/STATUS
index 4d5343b8f2..c5002ed36b 100644
--- a/STATUS
+++ b/STATUS
@@ -1,6 +1,6 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 1999/08/09 22:37:59 $
+  ______________                           $Date: 1999/08/14 20:49:37 $
 
   DEVELOPMENT STATE
 
@@ -55,6 +55,7 @@
 
   NEEDS PATCH
 
+    o  base64 decoding bug (Ivan Nejgebauer)
     o  salzr@certco.com (Rich Salz): Bug in X509_name_print
        <29E0A6D39ABED111A36000A0C99609CA2C2BA4@macertco-srv1.ma.certco.com>
     o  $(PERL) in */Makefile.ssl
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 110435d5df..c532a18eeb 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -291,15 +291,15 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
 
 		/* If we are at the end of input and it looks like a
 		 * line, process it. */
-		if (((i+1) == inl) && (((n&3) == 0) || eof))
+		if (((i+1) == inl) && (eof))
 			v=B64_EOF;
 
-		if ((v == B64_EOF) || (n >= 68))
+		if ((v == B64_EOF) || (n >= 64))
 			{
 			/* This is needed to work correctly on 64 byte input
 			 * lines.  We process the line and then need to
 			 * accept the '\n' */
-			if ((v != B64_EOF) && (n >= 68)) exp_nl=1;
+			if ((v != B64_EOF) && (n >= 64)) exp_nl=1;
 			tmp2=v;
 			if (n > 0)
 				{