@@ -878,11 +878,11 @@
     if (model != NULL) {
 	int mode;
 	/* Get the "model" context */
 	chan = Tcl_GetChannel(interp, model, &mode);
 	if (chan == (Tcl_Channel) NULL) {
-	    Tls_Free((char *) statePtr);
+	    Tls_Free(statePtr);
 	    return TCL_ERROR;
 	}
 
         /*
          * Make sure to operate on the topmost channel
@@ -889,19 +889,19 @@
          */
         chan = Tcl_GetTopChannel(chan);
 	if (Tcl_GetChannelType(chan) != Tls_ChannelType()) {
 	    Tcl_AppendResult(interp, "bad channel \"",
 		    Tcl_GetChannelName(chan), "\": not a TLS channel", NULL);
-	    Tls_Free((char *) statePtr);
+	    Tls_Free(statePtr);
 	    return TCL_ERROR;
 	}
 	ctx = ((State *)Tcl_GetChannelInstanceData(chan))->ctx;
     } else {
 	if ((ctx = CTX_Init(statePtr, server, proto, keyfile, certfile, key,
     cert, key_len, cert_len, CAdir, CAfile, ciphers,
     DHparams)) == (SSL_CTX*)0) {
-	    Tls_Free((char *) statePtr);
+	    Tls_Free(statePtr);
 	    return TCL_ERROR;
 	}
     }
 
     statePtr->ctx = ctx;
@@ -927,11 +927,11 @@
     dprintf("Created channel named %s", Tcl_GetChannelName(statePtr->self));
     if (statePtr->self == (Tcl_Channel) NULL) {
 	/*
 	 * No use of Tcl_EventuallyFree because no possible Tcl_Preserve.
 	 */
-	Tls_Free((char *) statePtr);
+	Tls_Free(statePtr);
 	return TCL_ERROR;
     }
 
     Tcl_SetChannelOption(interp, statePtr->self, "-translation", Tcl_DStringValue(&upperChannelTranslation));
     Tcl_SetChannelOption(interp, statePtr->self, "-encoding", Tcl_DStringValue(&upperChannelEncoding));
@@ -945,20 +945,20 @@
     statePtr->ssl = SSL_new(statePtr->ctx);
     if (!statePtr->ssl) {
 	/* SSL library error */
 	Tcl_AppendResult(interp, "couldn't construct ssl session: ", REASON(),
 		(char *) NULL);
-	Tls_Free((char *) statePtr);
+	Tls_Free(statePtr);
 	return TCL_ERROR;
     }
 
 #ifndef OPENSSL_NO_TLSEXT
     if (servername) {
         if (!SSL_set_tlsext_host_name(statePtr->ssl, servername) && require) {
             Tcl_AppendResult(interp, "setting TLS host name extension failed",
                 (char *) NULL);
-            Tls_Free((char *) statePtr);
+            Tls_Free(statePtr);
             return TCL_ERROR;
         }
     }
 #endif
 
@@ -1692,11 +1692,11 @@
  *	Frees all the state
  *
  *-------------------------------------------------------------------
  */
 void
-Tls_Free( char *blockPtr )
+Tls_Free( void *blockPtr )
 {
     State *statePtr = (State *)blockPtr;
 
     dprintf("Called");