@@ -36,32 +36,32 @@
 #define F2N( key, dsp) \
 	(((key) == NULL) ? (char *) NULL : \
 		Tcl_TranslateFileName(interp, (key), (dsp)))
 #define REASON()	ERR_reason_error_string(ERR_get_error())
 
-static void	InfoCallback(CONST SSL *ssl, int where, int ret);
+static void	InfoCallback(const SSL *ssl, int where, int ret);
 
 static int	CiphersObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	HandshakeObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	ImportObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	StatusObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	VersionObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	MiscObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static int	UnimportObjCmd(ClientData clientData,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
+			Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 
 static SSL_CTX *CTX_Init(State *statePtr, int isServer, int proto, char *key,
 			char *certfile, unsigned char *key_asn1, unsigned char *cert_asn1,
 			int key_asn1_len, int cert_asn1_len, char *CAdir, char *CAfile,
       char *ciphers, char *DHparams);
@@ -169,11 +169,11 @@
  * Side effects:
  *	Calls callback (if defined)
  *-------------------------------------------------------------------
  */
 static void
-InfoCallback(CONST SSL *ssl, int where, int ret)
+InfoCallback(const SSL *ssl, int where, int ret)
 {
     State *statePtr = (State*)SSL_get_app_data((SSL *)ssl);
     Tcl_Obj *cmdPtr;
     char *major; char *minor;
 
@@ -226,11 +226,11 @@
 
     if (where & (SSL_CB_LOOP|SSL_CB_EXIT)) {
 	Tcl_ListObjAppendElement( statePtr->interp, cmdPtr,
 	    Tcl_NewStringObj( SSL_state_string_long(ssl), -1) );
     } else if (where & SSL_CB_ALERT) {
-	CONST char *cp = (char *) SSL_alert_desc_string_long(ret);
+	const char *cp = (char *) SSL_alert_desc_string_long(ret);
 
 	Tcl_ListObjAppendElement( statePtr->interp, cmdPtr,
 	    Tcl_NewStringObj( cp, -1) );
     } else {
 	Tcl_ListObjAppendElement( statePtr->interp, cmdPtr,
@@ -495,13 +495,13 @@
 static int
 CiphersObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj	*CONST objv[];
+    Tcl_Obj	*const objv[];
 {
-    static CONST84 char *protocols[] = {
+    static const char *protocols[] = {
 	"ssl2",	"ssl3",	"tls1",	"tls1.1", "tls1.2", "tls1.3", NULL
     };
     enum protocol {
 	TLS_SSL2, TLS_SSL3, TLS_TLS1, TLS_TLS1_1, TLS_TLS1_2, TLS_TLS1_3, TLS_NONE
     };
@@ -635,14 +635,14 @@
  *	May force SSL negotiation to take place.
  *
  *-------------------------------------------------------------------
  */
 
-static int HandshakeObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+static int HandshakeObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
 	Tcl_Channel chan;		/* The channel to set a mode on. */
 	State *statePtr;		/* client state for ssl socket */
-	CONST char *errStr = NULL;
+	const char *errStr = NULL;
 	int ret = 1;
 	int err = 0;
 
 	dprintf("Called");
 
@@ -724,11 +724,11 @@
 static int
 ImportObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj *CONST objv[];
+    Tcl_Obj *const objv[];
 {
     Tcl_Channel chan;		/* The channel to set a mode on. */
     State *statePtr;		/* client state for ssl socket */
     SSL_CTX *ctx	        = NULL;
     Tcl_Obj *script	        = NULL;
@@ -964,11 +964,11 @@
 
     /*
      * SSL Callbacks
      */
 
-    SSL_set_app_data(statePtr->ssl, (VOID *)statePtr);	/* point back to us */
+    SSL_set_app_data(statePtr->ssl, (void *)statePtr);	/* point back to us */
 
     SSL_set_verify(statePtr->ssl, verify, VerifyCallback);
 
     SSL_CTX_set_info_callback(statePtr->ctx, InfoCallback);
 
@@ -1014,11 +1014,11 @@
 static int
 UnimportObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj *CONST objv[];
+    Tcl_Obj *const objv[];
 {
     Tcl_Channel chan;		/* The channel to set a mode on. */
 
     dprintf("Called");
 
@@ -1209,11 +1209,11 @@
         SSL_CTX_set_min_proto_version (ctx, TLS1_3_VERSION);
         SSL_CTX_set_max_proto_version (ctx, TLS1_3_VERSION);
     }
 #endif
     
-    SSL_CTX_set_app_data( ctx, (VOID*)interp);	/* remember the interpreter */
+    SSL_CTX_set_app_data( ctx, (void*)interp);	/* remember the interpreter */
     SSL_CTX_set_options( ctx, SSL_OP_ALL);	/* all SSL bug workarounds */
     SSL_CTX_set_options( ctx, off);	/* all SSL bug workarounds */
     SSL_CTX_sess_set_cache_size( ctx, 128);
 
     if (ciphers != NULL)
@@ -1401,11 +1401,11 @@
 static int
 StatusObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj	*CONST objv[];
+    Tcl_Obj	*const objv[];
 {
     State *statePtr;
     X509 *peer;
     Tcl_Obj *objPtr;
     Tcl_Channel chan;
@@ -1495,11 +1495,11 @@
 static int
 VersionObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj	*CONST objv[];
+    Tcl_Obj	*const objv[];
 {
     Tcl_Obj *objPtr;
 
     dprintf("Called");
 
@@ -1528,13 +1528,13 @@
 static int
 MiscObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
-    Tcl_Obj	*CONST objv[];
+    Tcl_Obj	*const objv[];
 {
-    static CONST84 char *commands [] = { "req", NULL };
+    static const char *commands [] = { "req", NULL };
     enum command { C_REQ, C_DUMMY };
     int cmd;
 
     dprintf("Called");