@@ -423,11 +423,15 @@
 {
     return -1;
 }
 #else
 static int
-PasswordCallback(char *buf, int size, TCL_UNUSED(int) /* verify */, void *udata)
+PasswordCallback(
+    char *buf,
+    int size,
+    TCL_UNUSED(int), /* verify */
+    void *udata)
 {
     State *statePtr	= (State *) udata;
     Tcl_Interp *interp	= statePtr->interp;
     Tcl_Obj *cmdPtr;
     int result;
@@ -435,11 +439,11 @@
     dprintf("Called");
 
     if (statePtr->password == NULL) {
 	if (Tcl_EvalEx(interp, "tls::password", -1, TCL_EVAL_GLOBAL)
 		== TCL_OK) {
-	    char *ret = (char *) Tcl_GetStringResult(interp);
+	    const char *ret = Tcl_GetStringResult(interp);
 	    strncpy(buf, ret, (size_t) size);
 	    return (int)strlen(ret);
 	} else {
 	    return -1;
 	}
@@ -459,11 +463,11 @@
 
     Tcl_Release((ClientData) statePtr);
     Tcl_Release((ClientData) statePtr->interp);
 
     if (result == TCL_OK) {
-	char *ret = (char *) Tcl_GetStringResult(interp);
+	const char *ret = Tcl_GetStringResult(interp);
 	strncpy(buf, ret, (size_t) size);
 	return (int)strlen(ret);
     } else {
 	return -1;
     }
@@ -747,11 +751,11 @@
     int proto = 0;
     int verify = 0, require = 0, request = 1;
 
     dprintf("Called");
 
-#if defined(NO_TLS1) && defined(NO_TLS1_1) && defined(NO_TLS1_2) && !defined(NO_SSL3)
+#if defined(NO_TLS1) && defined(NO_TLS1_1) && defined(NO_TLS1_2) && defined(NO_TLS1_3) && !defined(NO_SSL3)
     ssl3 = 1;
 #endif
 #if defined(NO_TLS1)
     tls1 = 0;
 #endif