CRL critical extension bugfix

[oweals/openssl.git] / test / recipes / 80-test_ssl_old.t

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 631adbf7eb674d96b4de1b687fa092c80453cf8a..ff1a50ab8fc2eaf468c8771735f809321448eda9 100644 (file)
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -79,7 +79,7 @@ my $client_sess="client.ss";
 # new format in ssl_test.c and add recipes to 80-test_ssl_new.t instead.
 plan tests =>
     1                          # For testss
-    +8                         # For the first testssl
+    +6                         # For the first testssl
     ;
 
 subtest 'test_ss' => sub {
@@ -564,7 +564,7 @@ sub testssl {
 
       SKIP: {
          skip "skipping SRP tests", 4
-             if $no_srp;
+             if $no_srp || alldisabled(grep !/^ssl3/, available_protocols("tls"));
 
          ok(run(test([@ssltest, "-tls1", "-cipher", "SRP", "-srpuser", "test", "-srppass", "abc123"])),
             'test tls1 with SRP');
@@ -579,50 +579,6 @@ sub testssl {
             'test tls1 with SRP auth via BIO pair');
        }
     };
-
-    subtest 'Multi-buffer tests' => sub {
-       ######################################################################
-
-       plan tests => 2;
-
-      SKIP: {
-         skip "Neither SSLv3 nor any TLS version are supported by this OpenSSL build", 2
-             if $no_anytls;
-
-         skip "skipping multi-buffer tests", 2
-             if (POSIX::uname())[4] ne "x86_64";
-
-         ok(run(test([@ssltest, "-cipher", "AES128-SHA",    "-bytes", "8m"])));
-
-         # We happen to know that AES128-SHA256 is TLSv1.2 only... for now.
-         skip "TLSv1.2 is not supported by this OpenSSL configuration", 1
-             if $no_tls1_2;
-
-         ok(run(test([@ssltest, "-cipher", "AES128-SHA256", "-bytes", "8m"])));
-       }
-    };
-
-    subtest 'Certificate Transparency tests' => sub {
-       ######################################################################
-
-       plan tests => 3;
-
-      SKIP: {
-        skip "Certificate Transparency is not supported by this OpenSSL build", 3
-            if $no_ct;
-        skip "TLSv1.0 is not supported by this OpenSSL build", 3
-            if $no_tls1;
-
-        $ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
-        my @ca = qw(-CAfile certCA.ss);
-        ok(run(test([@ssltest, @ca, "-bio_pair", "-tls1", "-noct"])));
-        # No SCTs provided, so this should fail.
-        ok(run(test([@ssltest, @ca, "-bio_pair", "-tls1", "-ct",
-                     "-should_negotiate", "fail-client"])));
-        # No SCTs provided, unverified chains still succeed.
-        ok(run(test([@ssltest, "-bio_pair", "-tls1", "-ct"])));
-        }
-    };
 }
 
 unlink $CAkey;