From ca6cb0bf8101976093b7efc834f4ce7118c9f3df Mon Sep 17 00:00:00 2001
From: Dirk <dirk@testssl.sh>
Date: Tue, 28 Feb 2017 18:33:17 +0100
Subject: [PATCH] updated from #632 from dcooper16/negotiated_cipher

---
 testssl.sh | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/testssl.sh b/testssl.sh
index 90e1521..a0d6925 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -5011,7 +5011,7 @@ read_dhbits_from_file() {
 
 
 run_server_preference() {
-     local cipher1 cipher2
+     local cipher1 cipher2 prev_cipher=""
      local default_cipher default_cipher_ossl default_proto
      local remark4default_cipher supported_sslv2_ciphers
      local -a cipher proto
@@ -5277,25 +5277,17 @@ run_server_preference() {
 
                for i in 1 2 3 4 5 6; do
                     if [[ -n "${cipher[i]}" ]]; then                                      # cipher not empty
-                          if [[ -z "${cipher[i-1]}" ]]; then                              # previous one empty
-                              #outln
+                          if [[ -z "$prev_cipher" ]] || [[ "$prev_cipher" != "${cipher[i]}" ]]; then
+                              [[ -n "$prev_cipher" ]] && outln
                               if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then
                                    out "$(printf -- "     %-30s %s" "${cipher[i]}:" "${proto[i]}")"     # print out both
                               else
                                    out "$(printf -- "     %-51s %s" "${cipher[i]}:" "${proto[i]}")"     # print out both
                               fi
-                          else                                                            # previous NOT empty
-                              if [[ "${cipher[i-1]}" == "${cipher[i]}" ]]; then           # and previous protocol same cipher
-                                   out ", ${proto[i]}"                                    # same cipher --> only print out protocol behind it
-                              else
-                                   outln
-                                   if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then
-                                        out "$(printf -- "     %-30s %s" "${cipher[i]}:" "${proto[i]}")"     # print out both
-                                   else
-                                        out "$(printf -- "     %-51s %s" "${cipher[i]}:" "${proto[i]}")"     # print out both
-                                   fi
-                             fi
-                          fi
+                         else
+                              out ", ${proto[i]}"           # same cipher --> only print out protocol behind it
+                        fi
+                        prev_cipher="${cipher[i]}"
                     fi
                     fileout "order_${proto[i]}_cipher" "INFO" "Default cipher on ${proto[i]}: ${cipher[i]} $remark4default_cipher"
                done