tests: add new feature 'SSLpinning'

... and make test 2034 and 2035 require it, and have it set when built
with OpenSSL or GnuTLS.
This commit is contained in:
Daniel Stenberg
2014-11-04 23:02:09 +01:00
parent c3df44389b
commit 445aab4b73
4 changed files with 12 additions and 0 deletions

View File

@@ -213,6 +213,7 @@ NTLM
OpenSSL OpenSSL
socks socks
SSL SSL
SSLpinning
TLS-SRP TLS-SRP
TrackMemory TrackMemory
unittest unittest

View File

@@ -25,6 +25,7 @@ MooMoo
<client> <client>
<features> <features>
SSL SSL
SSLpinning
</features> </features>
<server> <server>
https Server-localhost-sv.pem https Server-localhost-sv.pem

View File

@@ -17,6 +17,7 @@ PEM certificate
<client> <client>
<features> <features>
SSL SSL
SSLpinning
</features> </features>
<server> <server>
https Server-localhost-sv.pem https Server-localhost-sv.pem

View File

@@ -224,6 +224,8 @@ my $has_axtls; # built with axTLS
my $has_winssl; # built with WinSSL (Secure Channel aka Schannel) my $has_winssl; # built with WinSSL (Secure Channel aka Schannel)
my $has_darwinssl;# build with DarwinSSL (Secure Transport) my $has_darwinssl;# build with DarwinSSL (Secure Transport)
my $has_sslpinning; # built with a TLS backend that supports pinning
my $has_shared = "unknown"; # built shared my $has_shared = "unknown"; # built shared
my $resolver; # string to hold the resolver backend my $resolver; # string to hold the resolver backend
@@ -2299,10 +2301,12 @@ sub checksystem {
} }
elsif ($libcurl =~ /openssl/i) { elsif ($libcurl =~ /openssl/i) {
$has_openssl=1; $has_openssl=1;
$has_sslpinning=1;
$ssllib="OpenSSL"; $ssllib="OpenSSL";
} }
elsif ($libcurl =~ /gnutls/i) { elsif ($libcurl =~ /gnutls/i) {
$has_gnutls=1; $has_gnutls=1;
$has_sslpinning=1;
$ssllib="GnuTLS"; $ssllib="GnuTLS";
} }
elsif ($libcurl =~ /nss/i) { elsif ($libcurl =~ /nss/i) {
@@ -2758,6 +2762,11 @@ sub singletest {
next; next;
} }
} }
elsif($1 eq "SSLpinning") {
if($has_sslpinning) {
next;
}
}
elsif($1 eq "OpenSSL") { elsif($1 eq "OpenSSL") {
if($has_openssl) { if($has_openssl) {
next; next;