Check-in [c6821b0cf1]
Bounty program for improvements to Tcl and certain Tcl packages.
Overview
Comment:Complete private key name changes introduced in tlsIO.c Revision 1.18.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c6821b0cf1e28e90964220b084434893617bbd48
User & Date: razzell on 2004-02-11 22:41:25
Other Links: manifest | tags
Context
2004-02-13
02:09
Unify result handling in callback options. check-in: 20fd9291ba user: razzell tags: trunk
2004-02-11
22:41
Complete private key name changes introduced in tlsIO.c Revision 1.18. check-in: c6821b0cf1 user: razzell tags: trunk
22:36
Correct argument check error introduced in Revision 1.4. check-in: ec0e84eb75 user: razzell tags: trunk
Changes

Modified tests/remote.tcl from [b9011510b9] to [c8f880a3e5].

     5      5   # Source this file in the remote server you are using to test Tcl against.
     6      6   #
     7      7   # Copyright (c) 1995-1996 Sun Microsystems, Inc.
     8      8   #
     9      9   # See the file "license.terms" for information on usage and redistribution
    10     10   # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    11     11   #
    12         -# RCS: @(#) $Id: remote.tcl,v 1.5 2000/07/27 01:58:19 hobbs Exp $
           12  +# RCS: @(#) $Id: remote.tcl,v 1.6 2004/02/11 22:41:25 razzell Exp $
    13     13   
    14     14   # load tls package
    15     15   package require tls
    16     16   
    17     17   # Initialize message delimitor
    18     18   
    19     19   # Initialize command array
................................................................................
   170    170       puts -nonewline "Type Ctrl-C to terminate--> "
   171    171       flush stdout
   172    172   }
   173    173   
   174    174   set certsDir	[file join [file dirname [info script]] certs]
   175    175   set serverCert	[file join $certsDir server.pem]
   176    176   set caCert	[file join $certsDir cacert.pem]
   177         -set serverKey	[file join $certsDir skey.pem]
          177  +set serverKey	[file join $certsDir server.key]
   178    178   if {[catch {set serverSocket \
   179    179   	[tls::socket -myaddr $serverAddress -server __accept__ \
   180    180   	-cafile $caCert -certfile $serverCert -keyfile $serverKey \
   181    181   	$serverPort]} msg]} {
   182    182       puts "Server on $serverAddress:$serverPort cannot start: $msg"
   183    183   } else {
   184    184       vwait __server_wait_variable__
   185    185   }

Modified tests/tlsIO.test from [23c009e2f4] to [b1aa1b8e66].

     6      6   #
     7      7   # Copyright (c) 1994-1996 Sun Microsystems, Inc.
     8      8   # Copyright (c) 1998-2000 Ajuba Solutions. 
     9      9   #
    10     10   # See the file "license.terms" for information on usage and redistribution
    11     11   # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    12     12   #
    13         -# RCS: @(#) $Id: tlsIO.test,v 1.20 2003/12/15 18:46:20 razzell Exp $
           13  +# RCS: @(#) $Id: tlsIO.test,v 1.21 2004/02/11 22:41:25 razzell Exp $
    14     14   
    15     15   # Running socket tests with a remote server:
    16     16   # ------------------------------------------
    17     17   # 
    18     18   # Some tests in socket.test depend on the existence of a remote server to
    19     19   # which they connect. The remote server must be an instance of tcltest and it
    20     20   # must run the script found in the file "remote.tcl" in this directory. You
................................................................................
   209    209   	global commandSocket
   210    210   
   211    211   	if {[eof $commandSocket]} {
   212    212   	    error "remote server disappeared"
   213    213   	}
   214    214   
   215    215   	if {[catch {puts $commandSocket $c} msg]} {
   216         -	    error "remote server disappaered: $msg"
          216  +	    error "remote server disappeared: $msg"
   217    217   	}
   218    218   	if {[catch {puts $commandSocket "--Marker--Marker--Marker--"} msg]} {
   219    219   	    error "remote server disappeared: $msg"
   220    220   	}
   221    221   
   222    222   	set resp ""
   223    223   	while {1} {
................................................................................
   243    243   	# We need to be able to send certificate values that normalize
   244    244   	# filenames across platforms
   245    245   	sendCommand {
   246    246   	    set certsDir	[file join [file dirname [info script]] certs]
   247    247   	    set serverCert	[file join $certsDir server.pem]
   248    248   	    set clientCert	[file join $certsDir client.pem]
   249    249   	    set caCert		[file join $certsDir cacert.pem]
   250         -	    set serverKey	[file join $certsDir skey.pem]
   251         -	    set clientKey	[file join $certsDir ckey.pem]
          250  +	    set serverKey	[file join $certsDir server.key]
          251  +	    set clientKey	[file join $certsDir client.key]
   252    252   	}
   253    253       }
   254    254   }
   255    255   
   256    256   test tlsIO-1.1 {arg parsing for socket command} {socket} {
   257    257       list [catch {tls::socket -server} msg] $msg
   258    258   } {1 {wrong # args: should be "tls::socket -server command ?options? port"}}