Commit 38fff918 authored by Yang Tse's avatar Yang Tse
Browse files

test harness: fix detection of test harness host and client key files 

Regenerate curl's tests host and client key files also when, somehow,
any of these files are empty.
parent 5ea65fbc

tests/sshserver.pl

+4 −2
Original line number Original line Diff line number Diff line
@@ -362,8 +362,10 @@ if((($sshid =~ /OpenSSH/) && ($sshvernum < 299)) || 
#***************************************************************************

#***************************************************************************

# Generate host and client key files for curl's tests

# Generate host and client key files for curl's tests

#

#

if((! -e $hstprvkeyf) || (! -e $hstpubkeyf) ||

if((! -e $hstprvkeyf) || (! -s $hstprvkeyf) ||

   (! -e $cliprvkeyf) || (! -e $clipubkeyf)) {

   (! -e $hstpubkeyf) || (! -s $hstpubkeyf) ||

   (! -e $cliprvkeyf) || (! -s $cliprvkeyf) ||

   (! -e $clipubkeyf) || (! -s $clipubkeyf)) {

    # Make sure all files are gone so ssh-keygen doesn't complain

    # Make sure all files are gone so ssh-keygen doesn't complain

    unlink($hstprvkeyf, $hstpubkeyf, $cliprvkeyf, $clipubkeyf);

    unlink($hstprvkeyf, $hstpubkeyf, $cliprvkeyf, $clipubkeyf);

    logmsg 'generating host keys...' if($verbose);

    logmsg 'generating host keys...' if($verbose);