Bug fix for SSL/TLS streams terminating prematurely (with data available in pre buffer)

robbiehanson · robbiehanson · commit 83add44a8555 · 2012-06-07T18:01:51.000-07:00
diff --git a/GCD/GCDAsyncSocket.h b/GCD/GCDAsyncSocket.h
@@ -138,8 +138,9 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 #endif
 #if SECURE_TRANSPORT_MAYBE_AVAILABLE
 	SSLContextRef sslContext;
-	NSMutableData *sslReadBuffer;
+	GCDAsyncSocketPreBuffer *sslPreBuffer;
 	size_t sslWriteCachedLength;
+	OSStatus sslErrCode;
 #endif
 	
 	id userData;
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -2629,6 +2629,7 @@ - (void)closeWithError:(NSError *)error
 	#if SECURE_TRANSPORT_MAYBE_AVAILABLE
 	{
 		[sslPreBuffer reset];
+		sslErrCode = noErr;
 		
 		if (sslContext)
 		{
@@ -4517,8 +4518,19 @@ - (void)doReadData
 					if (result == errSSLWouldBlock)
 						waiting = YES;
 					else
-						error = [self sslError:result];
-					
+					{
+						if (result == errSSLClosedGraceful || result == errSSLClosedAbort)
+						{
+							// We've reached the end of the stream.
+							// Handle this the same way we would an EOF from the socket.
+							socketEOF = YES;
+							sslErrCode = result;
+						}
+						else
+						{
+							error = [self sslError:result];
+						}
+					}
 					// It's possible that bytesRead > 0, even if the result was errSSLWouldBlock.
 					// This happens when the SSLRead function is able to read some data,
 					// but not the entire amount we requested.
@@ -4910,7 +4922,23 @@ - (void)doReadEOF
 	{
 		if (error == nil)
 		{
-			error = [self connectionClosedError];
+			if ([self usingSecureTransportForTLS])
+			{
+				#if SECURE_TRANSPORT_MAYBE_AVAILABLE
+				if (sslErrCode != noErr && sslErrCode != errSSLClosedGraceful)
+				{
+					error = [self sslError:sslErrCode];
+				}
+				else
+				{
+					error = [self connectionClosedError];
+				}
+				#endif
+			}
+			else
+			{
+				error = [self connectionClosedError];
+			}
 		}
 		[self closeWithError:error];
 	}
@@ -6402,6 +6430,8 @@ - (void)ssl_startTLS
 		[sslPreBuffer didWrite:preBufferLength];
 	}
 	
+	sslErrCode = noErr;
+	
 	// Start the SSL Handshake process
 	
 	[self ssl_continueSSLHandshake];
