Custome built dladdr() for AIX.

[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 c4800d3e4f72a72a562776b9046eb536131d93b5..6468bd65716637cec1b686dd9dc3dc3c7ad6681e 100644 (file)
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -424,7 +424,7 @@ sub testssl {
     subtest "Testing ciphersuites" => sub {
 
         my @exkeys = ();
-        my $ciphers = "-EXP:-PSK:-SRP:-kDH:-kECDHe";
+        my $ciphers = "-PSK:-SRP";
 
         if ($no_dh) {
             note "skipping DHE tests\n";
@@ -468,13 +468,16 @@ sub testssl {
 
        foreach my $protocol (sort keys %ciphersuites) {
            note "Testing ciphersuites for $protocol";
+           # ssltest_old doesn't know -tls1_2, but that's fine, since that's
+           # the default choice if TLSv1.2 enabled
+           my $flag = $protocol eq "-tls1_2" ? "" : $protocol;
            foreach my $cipher (@{$ciphersuites{$protocol}}) {
                 if ($protocol eq "-ssl3" && $cipher =~ /ECDH/ ) {
                     note "*****SKIPPING $protocol $cipher";
                     ok(1);
                 } else {
                     ok(run(test([@ssltest, @exkeys, "-cipher", $cipher,
-                                 $protocol eq "SSLv3" ? ("-ssl3") : ()])),
+                                 $flag || ()])),
                        "Testing $cipher");
                }
            }