[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e8763c69745575e37988527e4025c3cd36081492 (commit)
      from  a2bb183623dac253792753b82e291fd1d180aa78 (commit)


- Log -----------------------------------------------------------------
commit e8763c69745575e37988527e4025c3cd36081492
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 22 11:06:20 2017 +0100

    Fix 80-test_ssl_old.t: only count the ciphers if there are any.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3014)

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

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 8b6f538..5010093 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -434,8 +434,8 @@ sub testssl {
 	    if ($ciphersstatus) {
 		$ciphersuites{$protocol} = [ map { s|\R||; split(/:/, $_) }
 					     @ciphers ];
+		$protocolciphersuitecount += scalar @{$ciphersuites{$protocol}};
 	    }
-	    $protocolciphersuitecount += scalar @{$ciphersuites{$protocol}};
 	}
 
         plan skip_all => "None of the ciphersuites to test are available in this OpenSSL build"