From: Richard Levitte <levitte@openssl.org>
Date: Wed, 22 Mar 2017 10:06:20 +0000 (+0100)
Subject: Fix 80-test_ssl_old.t: only count the ciphers if there are any.
X-Git-Tag: OpenSSL_1_1_1-pre1~1962
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e8763c69745575e37988527e4025c3cd36081492;p=oweals%2Fopenssl.git

Fix 80-test_ssl_old.t: only count the ciphers if there are any.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3014)
---

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 8b6f538eeb..501009384a 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"