Index: generic/tlsIO.c
==================================================================
--- generic/tlsIO.c
+++ generic/tlsIO.c
@@ -39,11 +39,11 @@
  *    Sets the device into blocking or nonblocking mode.
  *
  *-------------------------------------------------------------------
  */
 static int TlsBlockModeProc(void *instanceData, int mode) {
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
 
     if (mode == TCL_MODE_NONBLOCKING) {
 	statePtr->flags |= TLS_TCL_ASYNC;
     } else {
 	statePtr->flags &= ~(TLS_TCL_ASYNC);
@@ -214,11 +214,10 @@
 	case SSL_ERROR_NONE:
 	    /* The TLS/SSL I/O operation completed */
 	    dprintf("The connection is good");
 	    *errorCodePtr = 0;
 	    break;
-
 	case SSL_ERROR_ZERO_RETURN:
 	    /* The TLS/SSL peer has closed the connection for writing by sending the close_notify alert */
 	    dprintf("SSL_ERROR_ZERO_RETURN: Connect returned an invalid value...");
 	    *errorCodePtr = EINVAL;
 	    Tls_Error(statePtr, "Peer has closed the connection for writing by sending the close_notify alert");
@@ -249,12 +248,11 @@
 		}
 		Tls_Error(statePtr, (char *) ERR_reason_error_string(backingError));
 	    }
 
 	    statePtr->flags |= TLS_TCL_HANDSHAKE_FAILED;
-	    return(-1);
-
+	    return -1;
 	case SSL_ERROR_SSL:
 	    /* A non-recoverable, fatal error in the SSL library occurred, usually a protocol error */
 	    dprintf("SSL_ERROR_SSL: Got permanent fatal SSL error, aborting immediately");
 	    if (SSL_get_verify_result(statePtr->ssl) != X509_V_OK) {
 		Tls_Error(statePtr, (char *) X509_verify_cert_error_string(SSL_get_verify_result(statePtr->ssl)));
@@ -263,19 +261,10 @@
 		Tls_Error(statePtr, (char *) ERR_reason_error_string(backingError));
 	    }
 	    statePtr->flags |= TLS_TCL_HANDSHAKE_FAILED;
 	    *errorCodePtr = ECONNABORTED;
 	    return(-1);
-
-	case SSL_ERROR_WANT_READ:
-	case SSL_ERROR_WANT_WRITE:
-	case SSL_ERROR_WANT_X509_LOOKUP:
-	case SSL_ERROR_WANT_CONNECT:
-	case SSL_ERROR_WANT_ACCEPT:
-	case SSL_ERROR_WANT_ASYNC:
-	case SSL_ERROR_WANT_ASYNC_JOB:
-	case SSL_ERROR_WANT_CLIENT_HELLO_CB:
 	default:
 	    /* The operation did not complete and should be retried later. */
 	    dprintf("Operation did not complete, call function again later: %i", rc);
 	    *errorCodePtr = EAGAIN;
 	    dprintf("ERR(%d, %d) ", rc, *errorCodePtr);
@@ -314,11 +303,11 @@
     char *buf,
     int bufSize,
     int *errorCodePtr)
 {
     unsigned long backingError;
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
     int bytesRead;
     int tlsConnect;
     int err;
 
     *errorCodePtr = 0;
@@ -376,11 +365,10 @@
 
     switch (err) {
 	case SSL_ERROR_NONE:
 	    dprintBuffer(buf, bytesRead);
 	    break;
-
 	case SSL_ERROR_SSL:
 	    /* A non-recoverable, fatal error in the SSL library occurred, usually a protocol error */
 	    dprintf("SSL error, indicating that the connection has been aborted");
 	    if (backingError != 0) {
 		Tls_Error(statePtr, (char *) ERR_reason_error_string(backingError));
@@ -476,11 +464,11 @@
     const char *buf,
     int toWrite,
     int *errorCodePtr)
 {
     unsigned long backingError;
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
     int written, err;
     int tlsConnect;
 
     *errorCodePtr = 0;
 
@@ -591,11 +579,10 @@
 		*errorCodePtr = Tcl_GetErrno();
 		written = -1;
 		Tls_Error(statePtr, (char *) ERR_reason_error_string(backingError));
 	    }
 	    break;
-
 	case SSL_ERROR_SSL:
 	    /* A non-recoverable, fatal error in the SSL library occurred, usually a protocol error */
 	    dprintf("SSL error, indicating that the connection has been aborted");
 	    if (backingError != 0) {
 		Tls_Error(statePtr, (char *) ERR_reason_error_string(backingError));
@@ -638,11 +625,11 @@
     Tcl_Interp *interp,		/* For errors - can be NULL. */
     const char *optionName,	/* Name of the option to set the value for, or
 				 * NULL to get all options and their values. */
     const char *optionValue)	/* Value for option. */
 {
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
 
     Tcl_Channel downChan = Tls_GetParent(statePtr, TLS_TCL_FASTPATH);
     Tcl_DriverSetOptionProc *setOptionProc;
 
     setOptionProc = Tcl_ChannelSetOptionProc(Tcl_GetChannelType(downChan));
@@ -684,11 +671,11 @@
     Tcl_Interp *interp,		/* For errors - can be NULL. */
     const char *optionName,	/* Name of the option to retrieve the value for, or
 				 * NULL to get all options and their values. */
     Tcl_DString *optionValue)	/* Where to store the computed value initialized by caller. */
 {
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
 
     Tcl_Channel downChan = Tls_GetParent(statePtr, TLS_TCL_FASTPATH);
     Tcl_DriverGetOptionProc *getOptionProc;
 
     getOptionProc = Tcl_ChannelGetOptionProc(Tcl_GetChannelType(downChan));
@@ -728,11 +715,11 @@
     void *instanceData,    /* The socket state. */
     int mask)			/* Events of interest; an OR-ed combination of
 				 * TCL_READABLE, TCL_WRITABLE and TCL_EXCEPTION. */
 {
     Tcl_Channel     downChan;
-    State *statePtr = (State *) instanceData;
+    State *statePtr = (State *)instanceData;
     Tcl_DriverWatchProc *watchProc;
 
     dprintf("TlsWatchProc(0x%x)", mask);
 
     /* Pretend to be dead as long as the verify callback is running.