Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,6 +1,9 @@
 2004-06-29  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+	* tls.c:            Fixup to build against tcl 8.3.3. Handle
+	* tlsIO.c:          8.4 constification.
 
 	* tlsInt.h:         Added headers required with MSVC on Win32.
 	* tlsX509.c:        undef min and max if defined (win32).
 
 	* Makefile.in:      Fixed to build on win32 using msys with

Index: tls.c
==================================================================
--- tls.c
+++ tls.c
@@ -3,11 +3,11 @@
  * some modifications:
  *	Copyright (C) 2000 Ajuba Solutions
  *	Copyright (C) 2002 ActiveState Corporation
  *	Copyright (C) 2004 Starfish Systems 
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.22 2004/03/24 05:22:53 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.23 2004/06/29 11:07:08 patthoyts Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built (almost) from scratch based upon observation of
@@ -452,11 +452,11 @@
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
     Tcl_Obj	*CONST objv[];
 {
-    static CONST char *protocols[] = {
+    static CONST84 char *protocols[] = {
 	"ssl2",	"ssl3",	"tls1",	NULL
     };
     enum protocol {
 	TLS_SSL2, TLS_SSL3, TLS_TLS1, TLS_NONE
     };
@@ -1166,11 +1166,11 @@
     ClientData clientData;	/* Not used. */
     Tcl_Interp *interp;
     int objc;
     Tcl_Obj	*CONST objv[];
 {
-    const char *commands [] = { "req", NULL };
+    CONST84 char *commands [] = { "req", NULL };
     enum command { C_REQ, C_DUMMY };
     int cmd;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");

Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  * Copyright (C) 2000 Ajuba Solutions
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.14 2004/03/24 05:22:53 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsIO.c,v 1.15 2004/06/29 11:07:08 patthoyts Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built from scratch based upon observation of OpenSSL 0.9.2B
@@ -32,11 +32,11 @@
 static int	TlsInputProc _ANSI_ARGS_((ClientData instanceData,
 			char *buf, int bufSize, int *errorCodePtr));
 static int	TlsOutputProc _ANSI_ARGS_((ClientData instanceData,
 			CONST char *buf, int toWrite, int *errorCodePtr));
 static int	TlsGetOptionProc _ANSI_ARGS_ ((ClientData instanceData,
-			Tcl_Interp *interp, CONST char *optionName,
+			Tcl_Interp *interp, CONST84 char *optionName,
 			Tcl_DString *dsPtr));
 static void	TlsWatchProc _ANSI_ARGS_((ClientData instanceData, int mask));
 static int	TlsGetHandleProc _ANSI_ARGS_ ((ClientData instanceData,
 			int direction, ClientData *handlePtr));
 static int	TlsNotifyProc _ANSI_ARGS_ ((ClientData instanceData,
@@ -505,11 +505,11 @@
  *-------------------------------------------------------------------
  */
 static int
 TlsGetOptionProc(ClientData instanceData,	/* Socket state. */
 	Tcl_Interp *interp,		/* For errors - can be NULL. */
-	CONST char *optionName,		/* Name of the option to
+	CONST84 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. */

Index: tlsInt.h
==================================================================
--- tlsInt.h
+++ tlsInt.h
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.13 2004/06/29 10:58:08 patthoyts Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.14 2004/06/29 11:07:08 patthoyts Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built from scratch based upon observation of OpenSSL 0.9.2B
@@ -22,15 +22,20 @@
 
 #include "tls.h"
 #include <errno.h>
 #include <string.h>
 
-#ifdef WIN32
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wincrypt.h> /* OpenSSL needs this on Windows */
 #endif
+
+/* Handle tcl8.3->tcl8.4 CONST changes */
+#ifndef CONST84
+#define CONST84
+#endif
 
 #ifdef NO_PATENTS
 #define NO_IDEA
 #define NO_RC2
 #define NO_RC4