Fixed a bug that caused rebooting when SSL handshake failed

fhessel · fhessel · commit 0936e38a305e · 2018-03-05T01:54:42.000+01:00
diff --git a/https/HTTPSConnection.cpp b/https/HTTPSConnection.cpp
@@ -48,18 +48,26 @@ int HTTPSConnection::initialize(int serverSocketID, SSL_CTX * sslCtx, HTTPHeader
 
 			_ssl = SSL_new(sslCtx);
 
-			// Bind SSL to the socket
-			int success = SSL_set_fd(_ssl, _socket);
-			if (success) {
-
-				// Perform the handshake
-				success = SSL_accept(_ssl);
+			if (_ssl) {
+				// Bind SSL to the socket
+				int success = SSL_set_fd(_ssl, _socket);
 				if (success) {
-					_connectionState = STATE_INITIAL;
-					_httpHeaders = new HTTPHeaders();
-					refreshTimeout();
-					return _socket;
+
+					// Perform the handshake
+					success = SSL_accept(_ssl);
+					if (success) {
+						_connectionState = STATE_INITIAL;
+						_httpHeaders = new HTTPHeaders();
+						refreshTimeout();
+						return _socket;
+					} else {
+						HTTPS_DLOG("[ERR] SSL_accept failed. Aborting handshake.");
+					}
+				} else {
+					HTTPS_DLOG("[ERR] SSL_set_fd failed. Aborting handshake.");
 				}
+			} else {
+				HTTPS_DLOG("[ERR] SSL_new failed. Aborting handshake.");
 			}
 		}
 		_connectionState = STATE_ERROR;
