Index: tls.c
==================================================================
--- tls.c
+++ tls.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (C) 1997-1999 Matt Newman <matt@novadigm.com>
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.1.1.1 2000/01/19 22:10:58 aborr Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.2 2000/01/20 01:50:55 aborr 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
@@ -651,10 +651,17 @@
     if (verify == 0) verify = SSL_VERIFY_NONE;
 
     proto |= (ssl2 ? TLS_PROTO_SSL2 : 0);
     proto |= (ssl3 ? TLS_PROTO_SSL3 : 0);
     proto |= (tls1 ? TLS_PROTO_TLS1 : 0);
+
+    /* reset to NULL if blank string provided */
+    if (cert && !*cert) cert = NULL;
+    if (key && !*key) key = NULL;
+    if (ciphers && !*ciphers) ciphers = NULL;
+    if (CAfile && !*CAfile) CAfile = NULL;
+    if (CAdir && !*CAdir) CAdir = NULL;
 
     if (model != NULL) {
 	int mode;
 	/* Get the "model" context */
 	chan = Tcl_GetChannel( interp, model, &mode);

Index: tls.tcl
==================================================================
--- tls.tcl
+++ tls.tcl
@@ -1,9 +1,9 @@
 #
-# Copyright (C) 1997-1999 Matt Newman <matt@novadigm.com>
+# Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
 #
-# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.1.1.1 2000/01/19 22:10:58 aborr Exp $
+# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.2 2000/01/20 01:51:05 aborr Exp $
 #
 namespace eval tls {
     variable logcmd tclLog
     variable debug 0
  
@@ -49,10 +49,11 @@
 	set arg [lindex $args $idx]
 	switch -glob -- $server,$arg {
 	0,-myport	-
 	*,-myaddr	{lappend sopts $arg [lindex $args [incr idx]]}
 	0,-async	{lappend sopts $arg}
+	*,-cipher	-
 	*,-cadir	-
 	*,-cafile	-
 	*,-certfile	-
 	*,-keyfile	-
 	*,-command	-
@@ -103,11 +104,18 @@
     log 2 [list tls::_accept $iopts $callback $chan $ipaddr $port]
 
     set chan [eval [list tls::import $chan] $iopts]
 
     lappend callback $chan $ipaddr $port
-    uplevel #0 $callback
+    if {[catch {
+	uplevel #0 $callback
+    } err]} {
+	log 1 "tls::_accept error: ${::errorInfo}"
+	close $chan
+    } else {
+	log 2 "tls::_accept - called \"$callback\" succeeded"
+    }
 }
 #
 # Sample callback for hooking: -
 #
 # error