luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: make sure gnuserv-tls has SRP support before using it

Browse Source 
Reported-by: fundawang on github
Fixes #10522
Closes #10524
This commit is contained in:
Daniel Stenberg 2023-02-15 15:04:07 +01:00
parent f1d09231ad
commit 2fdc1d816e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/runtests.pl
View File

@ -5382,7 +5382,7 @@ sub startservers {
elsif($what eq "httptls") { elsif($what eq "httptls") {
if(!$httptlssrv) { if(!$httptlssrv) {
# for now, we can't run http TLS-EXT tests without gnutls-serv # for now, we can't run http TLS-EXT tests without gnutls-serv
return "no gnutls-serv"; return "no gnutls-serv (with SRP support)";
} }
if($torture && $run{'httptls'} && if($torture && $run{'httptls'} &&
!responsive_httptls_server($verbose, "IPv4")) { !responsive_httptls_server($verbose, "IPv4")) {

11
tests/sshhelp.pm
View File

@ -408,7 +408,16 @@ sub find_sshkeygen {
# Find httptlssrv (gnutls-serv) and return canonical filename # Find httptlssrv (gnutls-serv) and return canonical filename
# #
sub find_httptlssrv { sub find_httptlssrv {
return find_exe_file_hpath($httptlssrvexe); my $p = find_exe_file_hpath($httptlssrvexe);
my @o = `$p -l`;
my $found;
for(@o) {
if(/Key exchange: SRP/) {
$found = 1;
last;
}
}
return $p if($found);
} }