Index: generic/tlsDigest.c
==================================================================
--- generic/tlsDigest.c
+++ generic/tlsDigest.c
@@ -862,11 +862,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
 	return TCL_ERROR;
     }
 
     /* Get channel */
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size *) NULL), &mode);
+    chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &mode);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /* Make sure to operate on the topmost channel */
@@ -873,11 +873,11 @@
     chan = Tcl_GetTopChannel(chan);
 
     /* Check if digest channel */
     if (Tcl_GetChannelType(chan) != &digestChannelType) {
 	Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan),
-	    "\": not a digest channel", NULL);
+	    "\": not a digest channel", (char *) NULL);
 	Tcl_SetErrorCode(interp, "TLS", "UNSTACK", "CHANNEL", "INVALID", (char *) NULL);
 	return TCL_ERROR;
     }
 
     /* Pop transform from channel */
@@ -986,11 +986,11 @@
  *-------------------------------------------------------------------
  */
 int DigestCommandHandler(Tcl_Interp *interp, Tcl_Obj *cmdObj, Tcl_Obj *digestObj,
 	Tcl_Obj *cipherObj, int format, Tcl_Obj *keyObj, Tcl_Obj *macObj) {
     DigestState *statePtr;
-    char *cmdName = Tcl_GetStringFromObj(cmdObj, (Tcl_Size *) NULL);
+    char *cmdName = Tcl_GetString(cmdObj);
 
     dprintf("Called");
 
     /* Create state data structure */
     if ((statePtr = DigestStateNew(interp, format)) == NULL) {
@@ -1186,11 +1186,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "?-bin|-hex? ?-cipher name? ?-digest name? ?-key key? ?-mac name? [-channel chan | -command cmdName | -file filename | ?-data? data]");
 	return TCL_ERROR;
     }
 
     /* Special case of first arg is digest, cipher, or mac */
-    opt = Tcl_GetStringFromObj(objv[start], (Tcl_Size *) NULL);
+    opt = Tcl_GetString(objv[start]);
     if (opt[0] != '-') {
 	switch(type) {
 	case TYPE_MD:
 	case TYPE_HMAC:
 	    digestObj = objv[start++];
@@ -1206,11 +1206,11 @@
 
     /* Get options */
     for (int idx = start; idx < objc; idx++) {
 	/* Special case for when last arg is data */
 	if (idx == objc - 1) {
-	    opt = Tcl_GetStringFromObj(objv[idx], (Tcl_Size *) NULL);
+	    opt = Tcl_GetString(objv[idx]);
 	    if (opt[0] != '-' && dataObj == NULL) {
 		dataObj = objv[idx];
 		break;
 	    }
 	}
@@ -1278,11 +1278,11 @@
 	}
     }
 
     if (type == TYPE_MAC) {
 	if (macObj != NULL) {
-	    char *macName = Tcl_GetStringFromObj(macObj, (Tcl_Size *) NULL);
+	    char *macName = Tcl_GetString(macObj);
 	    if (strcmp(macName,"cmac") == 0) {
 		type = TYPE_CMAC;
 	    } else if (strcmp(macName,"hmac") == 0) {
 		type = TYPE_HMAC;
 	    } else {

Index: generic/tlsEncrypt.c
==================================================================
--- generic/tlsEncrypt.c
+++ generic/tlsEncrypt.c
@@ -819,11 +819,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
 	return TCL_ERROR;
     }
 
     /* Get channel */
-    chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size *) NULL), &mode);
+    chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), &mode);
     if (chan == (Tcl_Channel) NULL) {
 	return TCL_ERROR;
     }
 
     /* Make sure to operate on the topmost channel */
@@ -830,11 +830,11 @@
     chan = Tcl_GetTopChannel(chan);
 
     /* Check if encryption channel */
     if (Tcl_GetChannelType(chan) != &encryptChannelType) {
 	Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan),
-	    "\": not a encryption channel", NULL);
+	    "\": not a encryption channel", (char *) NULL);
 	Tcl_SetErrorCode(interp, "TLS", "UNSTACK", "CHANNEL", "INVALID", (char *) NULL);
 	return TCL_ERROR;
     }
 
     /* Pop transform from channel */
@@ -964,11 +964,11 @@
  *-------------------------------------------------------------------
  */
 int EncryptCommandHandler(Tcl_Interp *interp, int type, Tcl_Obj *cmdObj,
 	Tcl_Obj *cipherObj, Tcl_Obj *digestObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) {
     EncryptState *statePtr;
-    char *cmdName = Tcl_GetStringFromObj(cmdObj, (Tcl_Size *) NULL);
+    char *cmdName = Tcl_GetString(cmdObj);
 
     dprintf("Called");
 
     if ((statePtr = EncryptStateNew(interp, type)) == NULL) {
 	Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL);
@@ -1202,11 +1202,11 @@
 	Tcl_WrongNumArgs(interp, 1, objv, "?-cipher? name ?-digest name? -key key ?-iv string? ?-mac name? [-channel chan | -command cmdName | -infile filename -outfile filename | ?-data? data]");
 	return TCL_ERROR;
     }
 
     /* Special case of first arg is cipher */
-    opt = Tcl_GetStringFromObj(objv[start], (Tcl_Size *) NULL);
+    opt = Tcl_GetString(objv[start]);
     if (opt[0] != '-') {
 	switch(type) {
 	case TYPE_ENCRYPT:
 	case TYPE_DECRYPT:
 	    cipherObj = objv[start++];
@@ -1216,11 +1216,11 @@
 
     /* Get options */
     for (int idx = start; idx < objc; idx++) {
 	/* Special case for when last arg is data */
 	if (idx == objc - 1) {
-	opt = Tcl_GetStringFromObj(objv[idx], (Tcl_Size *) NULL);
+	opt = Tcl_GetString(objv[idx]);
 	    if (opt[0] != '-' && dataObj == NULL) {
 		dataObj = objv[idx];
 		break;
 	    }
 	}

Index: generic/tlsInfo.c
==================================================================
--- generic/tlsInfo.c
+++ generic/tlsInfo.c
@@ -71,11 +71,11 @@
 int CipherInfo(Tcl_Interp *interp, Tcl_Obj *nameObj) {
     const EVP_CIPHER *cipher;
     Tcl_Obj *resultObj, *listObj;
     unsigned long flags, mode;
     char *modeName = NULL;
-    char *name = Tcl_GetStringFromObj(nameObj, (Tcl_Size *) NULL);
+    char *name = Tcl_GetString(nameObj);
 
     /* Get cipher */
     cipher = EVP_get_cipherbyname(name);
 
     if (cipher == NULL) {
@@ -453,11 +453,11 @@
  */
 int DigestInfo(Tcl_Interp *interp, Tcl_Obj *nameObj) {
     const EVP_MD *md;
     Tcl_Obj *resultObj, *listObj;
     unsigned long flags;
-    char *name = Tcl_GetStringFromObj(nameObj, (Tcl_Size *) NULL);
+    char *name = Tcl_GetString(nameObj);
 
     /* Get message digest */
     md = EVP_get_digestbyname(name);
 
     if (md == NULL) {
@@ -646,11 +646,11 @@
  *-------------------------------------------------------------------
  */
 int MacInfo(Tcl_Interp *interp, Tcl_Obj *nameObj) {
     Tcl_Obj *resultObj;
     int res = TCL_OK;
-    char *name = Tcl_GetStringFromObj(nameObj, (Tcl_Size *) NULL);
+    char *name = Tcl_GetString(nameObj);
 
     if (strcmp(name, "cmac") != 0 && strcmp(name, "hmac") != 0) {
 	Tcl_AppendResult(interp, "Invalid MAC \"", name, "\"", (char *) NULL);
 	return TCL_ERROR;
     }
@@ -751,11 +751,11 @@
  *-------------------------------------------------------------------
  */
 int PkeyInfo(Tcl_Interp *interp, Tcl_Obj *nameObj) {
     Tcl_Obj *resultObj;
     int res = TCL_OK;
-    char *name = Tcl_GetStringFromObj(nameObj, (Tcl_Size *) NULL);
+    char *name = Tcl_GetString(nameObj);
     EVP_PKEY *pkey = NULL;
 
     if (pkey == NULL) {
 	Tcl_AppendResult(interp, "Invalid public key method \"", name, "\"", (char *) NULL);
 	return TCL_ERROR;
@@ -949,11 +949,11 @@
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "name");
 	return TCL_ERROR;
     }
 
-    name = Tcl_GetStringFromObj(objv[1], NULL);
+    name = Tcl_GetString(objv[1]);
     if (!OSSL_PROVIDER_try_load(NULL, (const char *) name, 1)) {
 	Tcl_AppendResult(interp, GET_ERR_REASON(), (char *) NULL);
 	return TCL_ERROR;
     }
 

Index: generic/tlsUtil.c
==================================================================
--- generic/tlsUtil.c
+++ generic/tlsUtil.c
@@ -30,11 +30,11 @@
 EVP_CIPHER *Util_GetCipher(Tcl_Interp *interp, Tcl_Obj *cipherObj, int no_null) {
     EVP_CIPHER *cipher = NULL;
     char *name = NULL;
 
     if (cipherObj != NULL) {
-	name = Tcl_GetStringFromObj(cipherObj, (Tcl_Size *) NULL);
+	name = Tcl_GetString(cipherObj);
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 	cipher = EVP_get_cipherbyname(name);
 #else
 	cipher = EVP_CIPHER_fetch(NULL, name, NULL);
 #endif
@@ -65,11 +65,11 @@
 EVP_MD *Util_GetDigest(Tcl_Interp *interp, Tcl_Obj *digestObj, int no_null) {
     EVP_MD *md = NULL;
     char *name = NULL;
 
     if (digestObj != NULL) {
-	name = Tcl_GetStringFromObj(digestObj, (Tcl_Size *) NULL);
+	name = Tcl_GetString(digestObj);
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 	md = EVP_get_digestbyname(name);
 #else
 	md = EVP_MD_fetch(NULL, name, NULL);
 #endif
@@ -169,11 +169,11 @@
 EVP_MAC *Util_GetMAC(Tcl_Interp *interp, Tcl_Obj *MacObj, int no_null) {
     EVP_MAC *mac = NULL;
     char *name = NULL;
 
     if (MacObj != NULL) {
-	name = Tcl_GetStringFromObj(MacObj, (Tcl_Size *) NULL);
+	name = Tcl_GetString(MacObj);
 	mac = EVP_MAC_fetch(NULL, name, NULL);
 	if (mac == NULL) {
 	    Tcl_AppendResult(interp, "invalid MAC \"", name, "\"", (char *) NULL);
 	    return NULL;
 	}