Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
+2004-02-03  Dan Razzell <research@starfishsystems.ca>
+
+	* Makefile.in:	Removed circular dependency.
+	* tlsInt.h:	Make function declarations explicit.
+	* tls.c:	Fix type match and unused variable warnings.
+	* tlsBIO.c:	Fix type match warning.
+
 2003-12-15  Dan Razzell	<research@starfishsystems.ca>
 
 	* pkgIndex.tcl.in:
 	* tls.htm:
 	* tests/tlsIO.test: updated version to 1.5.

Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -10,11 +10,11 @@
 # All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.18 2002/02/04 22:45:53 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.19 2004/02/04 04:02:17 razzell Exp $
 
 
 lib_BINARIES=$(tls_LIB_FILE)
 BINARIES=$(lib_BINARIES)
 
@@ -298,13 +298,10 @@
 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/fixstrtod.c` -o $@
 
 strncasecmp.$(OBJEXT): $(srcdir)/strncasecmp.c
 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/strncasecmp.c` -o $@
 
-tls.tcl: $(srcdir)/tls.tcl
-	cp $(srcdir)/tls.tcl tls.tcl
-
 #========================================================================
 # End of user-definable section
 #========================================================================
 
 #========================================================================

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) 2003 Starfish Systems 
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.18 2003/10/07 22:57:02 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.19 2004/02/04 04:02:19 razzell 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
@@ -844,11 +844,11 @@
 
     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);
+    SSL_CTX_set_info_callback(statePtr->ctx, (void (*)())InfoCallback);
 
     /* Create Tcl_Channel BIO Handler */
     statePtr->p_bio	= BIO_new_tcl(statePtr, BIO_CLOSE);
     statePtr->bio	= BIO_new(BIO_f_ssl());
 
@@ -1180,11 +1180,11 @@
 	    X509 *cert=NULL;
 	    X509_NAME *name=NULL;
 	    Tcl_Obj **listv;
 	    int listc,i;
 
-	    BIO *in=NULL,*out=NULL;
+	    BIO *out=NULL;
 
 	    char *k_C="",*k_ST="",*k_L="",*k_O="",*k_OU="",*k_CN="",*k_Email="";
 	    char *keyout,*pemout,*str;
 	    int keysize,serial=0,days=365;
 	    

Index: tlsBIO.c
==================================================================
--- tlsBIO.c
+++ tlsBIO.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.6 2002/02/04 22:46:31 hobbs Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsBIO.c,v 1.7 2004/02/04 04:02:19 razzell Exp $
  *
  * Provides BIO layer to interface openssl to Tcl.
  */
 
 #include "tlsInt.h"
@@ -13,11 +13,11 @@
  */
 
 static int BioWrite	_ANSI_ARGS_ ((BIO *h, CONST char *buf, int num));
 static int BioRead	_ANSI_ARGS_ ((BIO *h, char *buf, int num));
 static int BioPuts	_ANSI_ARGS_ ((BIO *h, CONST char *str));
-static long BioCtrl	_ANSI_ARGS_ ((BIO *h, int cmd, long arg1, CONST char *ptr));
+static long BioCtrl	_ANSI_ARGS_ ((BIO *h, int cmd, long arg1, void *ptr));
 static int BioNew	_ANSI_ARGS_ ((BIO *h));
 static int BioFree	_ANSI_ARGS_ ((BIO *h));
 
 
 static BIO_METHOD BioMethods = {
@@ -135,11 +135,11 @@
 static long
 BioCtrl	(bio, cmd, num, ptr)
     BIO *bio;
     int cmd;
     long num;
-    CONST char *ptr;
+    void *ptr;
 {
     Tcl_Channel chan = Tls_GetParent((State*)bio->ptr);
     long ret = 1;
     int *ip;
 

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.10 2003/05/15 21:02:10 razzell Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tlsInt.h,v 1.11 2004/02/04 04:02:19 razzell 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
@@ -20,10 +20,11 @@
 #ifndef _TSLINT_H
 #define _TLSINT_H
 
 #include "tls.h"
 #include <errno.h>
+#include <string.h>
 
 #ifdef NO_PATENTS
 #define NO_IDEA
 #define NO_RC2
 #define NO_RC4
@@ -33,13 +34,15 @@
 #endif
 
 #ifdef BSAFE
 #include <ssl.h>
 #include <err.h>
+#include <rand.h>
 #else
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/rand.h>
 #endif
 
 #ifdef TCL_STORAGE_CLASS
 # undef TCL_STORAGE_CLASS
 #endif