mirror of
				https://github.com/drwetter/testssl.sh.git
				synced 2025-10-31 05:45:26 +01:00 
			
		
		
		
	Merge pull request #1798 from drwetter/client_always_wide
Client simulation per default as wide
This commit is contained in:
		| @@ -26,7 +26,8 @@ | ||||
| * Added environment variable for amount of attempts for ssl renegotiation check | ||||
| * Added --user-agent argument to support using a custom User Agent | ||||
| * Added --overwrite argument to support overwriting output files without warning | ||||
| * Headerflag X-XSS-Protection is labeled as INFO  | ||||
| * Headerflag X-XSS-Protection is now labeled as INFO | ||||
| * Client simulation runs in wide mode which is even better readable | ||||
|  | ||||
| ### Features implemented / improvements in 3.0 | ||||
|  | ||||
|   | ||||
| @@ -4814,7 +4814,6 @@ run_client_simulation() { | ||||
|      outln | ||||
|      debugme echo | ||||
| 
 | ||||
|      if "$WIDE"; then | ||||
|      if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then | ||||
|           out " Browser                      Protocol  Cipher Suite Name (OpenSSL)       " | ||||
|           ( "$using_sockets" || "$HAS_DH_BITS") && out "Forward Secrecy" | ||||
| @@ -4828,7 +4827,6 @@ run_client_simulation() { | ||||
|      fi | ||||
|      ( "$using_sockets" || "$HAS_DH_BITS") && out "----------------------" | ||||
|      outln | ||||
|      fi | ||||
|      if ! "$using_sockets"; then | ||||
|           # We can't use the connectivity checker here as of now the openssl reply is always empty (reason??) | ||||
|           save_max_ossl_fail=$MAX_OSSL_FAIL | ||||
| @@ -4939,13 +4937,11 @@ run_client_simulation() { | ||||
|                               [[ -z "$cipher" ]] && cipher=$(get_cipher $TMPFILE) | ||||
|                          fi | ||||
|                          out "$proto   " | ||||
|                          "$WIDE" && out "  " | ||||
|                          if [[ "$COLOR" -le 2 ]]; then | ||||
|                               out "$cipher" | ||||
|                          else | ||||
|                               pr_cipher_quality "$cipher" | ||||
|                          fi | ||||
|                          if "$WIDE"; then | ||||
|                          if [[ "$DISPLAY_CIPHERNAMES" =~ openssl ]]; then | ||||
|                               for (( j=${#cipher}; j < 34; j++ )); do | ||||
|                                    out " " | ||||
| @@ -4955,10 +4951,8 @@ run_client_simulation() { | ||||
|                                    out " " | ||||
|                               done | ||||
|                          fi | ||||
|                          fi | ||||
|                          if [[ -n "$what_dh" ]]; then | ||||
|                               [[ -n "$curve" ]] && curve="($curve)" | ||||
|                               "$WIDE" || out ", " | ||||
|                               if [[ "$what_dh" == ECDH ]]; then | ||||
|                                    pr_ecdh_quality "$bits" "$(printf -- "%-12s" "$bits bit $what_dh") $curve" | ||||
|                               else | ||||
| @@ -4966,7 +4960,6 @@ run_client_simulation() { | ||||
|                               fi | ||||
|                          else | ||||
|                               if "$HAS_DH_BITS" || ( "$using_sockets" && [[ -n "${handshakebytes[i]}" ]] ); then | ||||
|                                    "$WIDE" || out ", " | ||||
|                                    out "No FS" | ||||
|                               fi | ||||
|                          fi | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Dirk Wetter
					Dirk Wetter