@@ -8,11 +8,11 @@ # Copyright (c) 1998-2000 Ajuba Solutions. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tlsIO.test,v 1.14 2000/06/08 00:06:40 aborr Exp $ +# RCS: @(#) $Id: tlsIO.test,v 1.14.2.1 2000/07/11 04:58:46 hobbs Exp $ # Running socket tests with a remote server: # ------------------------------------------ # # Some tests in socket.test depend on the existence of a remote server to @@ -72,10 +72,11 @@ package require tls set tlsServerPort 8048 set certsDir [file join [file dirname [info script]] certs] +#set certsDir ~hobbs/cvs/tls/tests/certs set serverCert [file join $certsDir server.pem] set clientCert [file join $certsDir client.pem] set caCert [file join $certsDir cacert.pem] set serverKey [file join $certsDir skey.pem] @@ -332,10 +333,12 @@ -certfile $clientCert -cafile $caCert \ -keyfile $clientKey 127.0.0.1 8829} sock]} { set x $sock catch {close [tls::socket 127.0.0.1 8829]} } else { + # HOBBS handshake shouldn't be necessary + tls::handshake $sock puts $sock hello flush $sock lappend x [gets $f] close $sock } @@ -369,10 +372,12 @@ if {[catch {tls::socket -myaddr 127.0.0.1 \ -certfile $clientCert -cafile $caCert \ -keyfile $clientKey 127.0.0.1 8830} sock]} { set x $sock } else { + # HOBBS handshake shouldn't be necessary + tls::handshake $sock puts $sock hello catch {flush $sock} lappend x [gets $f] close $sock } @@ -405,10 +410,12 @@ gets $f x if {[catch {tls::socket -certfile $clientCert -cafile $caCert \ -keyfile $clientKey [info hostname] 8831} sock]} { set x $sock } else { + # HOBBS handshake shouldn't be necessary + tls::handshake $sock puts $sock hello flush $sock lappend x [gets $f] close $sock } @@ -441,10 +448,12 @@ gets $f x if {[catch {tls::socket -certfile $clientCert -cafile $caCert \ -keyfile $clientKey 127.0.0.1 8832} sock]} { set x $sock } else { + # HOBBS handshake shouldn't be necessary + tls::handshake $sock puts $sock hello flush $sock lappend x [gets $f] close $sock } @@ -760,11 +769,11 @@ lappend x [gets $f] close $f set x } {ready done} -test tlsIO-4.1 {server with several clients} {socket stdio} { +test tlsIO-4.1 {server with several clients} {hangsHobbs socket stdio} { removeFile script set f [open script w] puts $f { package require tls gets stdin