Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
+TclTLS 1.7.22
+==========
+
+Release Date: Mon Oct 12 15:40:16 CDT 2020
+
+https://tcltls.rkeene.org/
+
 2015-05-01  Andreas Kupries  <andreask@activestate.com>
 
 	* configure.in: Bump to version 1.6.5.
 	* win/makefile.vc:
 	* configure: regen with ac-2.59

Index: README.txt
==================================================================
--- README.txt
+++ README.txt
@@ -1,5 +1,12 @@
+TclTLS 1.7.22
+==========
+
+Release Date: Mon Oct 12 15:40:16 CDT 2020
+
+https://tcltls.rkeene.org/
+
 Original TLS Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
 TLS 1.4.1    Copyright (C) 2000 Ajuba Solutions
 TLS 1.6      Copyright (C) 2008 ActiveState Software Inc.
 TLS 1.7      Copyright (C) 2016 Matt Newman, Ajuba Solutions, ActiveState
                                 Software Inc, Roy Keene <tcltls@rkeene.org>

Index: pkgIndex.tcl.in
==================================================================
--- pkgIndex.tcl.in
+++ pkgIndex.tcl.in
@@ -1,6 +1,6 @@
-if {[package vsatisfies [package present Tcl] 8.5]} {
+if {[package vsatisfies [package present Tcl] 8.6-]} {
 	package ifneeded tls @PACKAGE_VERSION@ [list apply {{dir} {
 		if {{@TCLEXT_BUILD@} eq "static"} {
 			load {} Tls
 		} else {
 			load [file join $dir @EXTENSION_TARGET@] Tls
@@ -9,8 +9,6 @@
 		set tlsTclInitScript [file join $dir tls.tcl]
 		if {[file exists $tlsTclInitScript]} {
 			source $tlsTclInitScript
 		}
 	}} $dir]
-} elseif {[package vsatisfies [package present Tcl] 8.4]} {
-	package ifneeded tls @PACKAGE_VERSION@ [list load [file join $dir @EXTENSION_TARGET@] Tls]
 }

Index: tclOpts.h
==================================================================
--- tclOpts.h
+++ tclOpts.h
@@ -24,11 +24,11 @@
     var = objv[idx];				\
     OPT_POSTLOG()
 
 #define OPTSTR(option, var)			\
     OPT_PROLOG(option)				\
-    var = Tcl_GetStringFromObj(objv[idx], NULL);\
+    var = Tcl_GetString(objv[idx]);\
     OPT_POSTLOG()
 
 #define OPTINT(option, var)			\
     OPT_PROLOG(option)				\
     if (Tcl_GetIntFromObj(interp, objv[idx],	\

Index: tls.c
==================================================================
--- tls.c
+++ tls.c
@@ -367,11 +367,11 @@
     dprintf("Called");
 
     if (msg && *msg) {
 	Tcl_SetErrorCode(statePtr->interp, "SSL", msg, (char *)NULL);
     } else {
-	msg = Tcl_GetStringFromObj(Tcl_GetObjResult(statePtr->interp), NULL);
+	msg = Tcl_GetString(Tcl_GetObjResult(statePtr->interp));
     }
     statePtr->err = msg;
 
     if (statePtr->callback == (Tcl_Obj*)NULL) {
 	char buf[BUFSIZ];
@@ -649,11 +649,11 @@
 	if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "channel");
 		return(TCL_ERROR);
 	}
 
-	chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+	chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
 	if (chan == (Tcl_Channel) NULL) {
 		return(TCL_ERROR);
 	}
 
 	/*
@@ -780,11 +780,11 @@
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel ?options?");
 	return TCL_ERROR;
     }
 
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL);
+    chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /*
@@ -791,11 +791,11 @@
      * Make sure to operate on the topmost channel
      */
     chan = Tcl_GetTopChannel(chan);
 
     for (idx = 2; idx < objc; idx++) {
-	char *opt = Tcl_GetStringFromObj(objv[idx], NULL);
+	char *opt = Tcl_GetString(objv[idx]);
 
 	if (opt[0] != '-')
 	    break;
 
 	OPTSTR( "-cadir", CAdir);
@@ -1414,16 +1414,16 @@
 
     dprintf("Called");
 
     switch (objc) {
 	case 2:
-	    channelName = Tcl_GetStringFromObj(objv[1], NULL);
+	    channelName = Tcl_GetString(objv[1]);
 	    break;
 
 	case 3:
 	    if (!strcmp (Tcl_GetString (objv[1]), "-local")) {
-		channelName = Tcl_GetStringFromObj(objv[2], NULL);
+		channelName = Tcl_GetString(objv[2]);
 		break;
 	    }
 	    /* else fall... */
 	default:
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel");
@@ -1787,13 +1787,13 @@
 	/*
 	 * We only support Tcl 8.4 or newer
 	 */
 	if (
 #ifdef USE_TCL_STUBS
-	    Tcl_InitStubs(interp, "8.4", 0)
+	    Tcl_InitStubs(interp, "8.6-", 0)
 #else
-	    Tcl_PkgRequire(interp, "Tcl", "8.4", 0)
+	    Tcl_PkgRequire(interp, "Tcl", "8.6-", 0)
 #endif
 	     == NULL) {
 		return TCL_ERROR;
 	}
 

Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -641,11 +641,11 @@
  *-------------------------------------------------------------------
  */
 static int
 TlsGetOptionProc(ClientData instanceData,	/* Socket state. */
 	Tcl_Interp *interp,		/* For errors - can be NULL. */
-	const char *optionName,	/* Name of the option to
+	const char *optionName,		/* Name of the option to
 					 * retrieve the value for, or
 					 * NULL to get all options and
 					 * their values. */
 	Tcl_DString *dsPtr)		/* Where to store the computed value
 					 * initialized by caller. */