[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  73159f403e9cea280f83477d0dd1f2b933a7e6c2 (commit)
      from  f5de06aae1596c2e1174b5a251f5d2af2d9ef48e (commit)


- Log -----------------------------------------------------------------
commit 73159f403e9cea280f83477d0dd1f2b933a7e6c2
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 10 10:49:48 2016 +0100

    Fix no-dtls* builds
    
    Most of the no-dtls* builds were failing due to one test which had an
    incorrect "skip" condition.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/80-test_ssl_old.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 59d48a0..4b932fd 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -756,7 +756,7 @@ sub testssl {
     subtest 'DTLS session reuse' => sub {
         plan tests => 12;
       SKIP: {
-        skip "DTLS disabled", 12 if $no_dtls;
+        skip "DTLS1.0 or DTLS1.2 disabled", 12 if $no_dtls1 || $no_dtls1_2;
 
         ok(run(test([@ssltest, "-dtls", "-server_sess_out", $server_sess, "-client_sess_out", $client_sess])));
         ok(run(test([@ssltest, "-dtls", "-server_sess_in", $server_sess, "-client_sess_in", $client_sess, "-should_reuse", "1", "-should_negotiate", "dtls1.2"])));