mirror of
				https://github.com/drwetter/testssl.sh.git
				synced 2025-11-03 23:35:26 +01:00 
			
		
		
		
	Merge pull request #787 from sdann/fix_has_server_protocol
Fix logic in has_server_protocol()
This commit is contained in:
		@@ -3791,7 +3791,7 @@ add_tls_offered() {
 | 
			
		||||
 | 
			
		||||
# function which checks whether SSLv2 - TLS 1.2 is being offereed
 | 
			
		||||
has_server_protocol() {
 | 
			
		||||
     [[ -z "$PROTOS_OFFERED" ]] && return 0            # if empty we rather return 0, means check at additional cost=connect will be done
 | 
			
		||||
     [[ -z "$PROTOS_OFFERED" ]] && return 1  # if empty return 1, hinting to the caller to check at additional cost/connect
 | 
			
		||||
     if grep -qw "$1" <<< "$PROTOS_OFFERED"; then
 | 
			
		||||
          return 0
 | 
			
		||||
     fi
 | 
			
		||||
@@ -9107,7 +9107,7 @@ run_ccs_injection(){
 | 
			
		||||
          tls_hexcode="x03, x03"
 | 
			
		||||
     elif $(has_server_protocol "ssl3"); then
 | 
			
		||||
          tls_hexcode="x03, x00"
 | 
			
		||||
     else # no protcol for some reason defined, determine TLS versions offered with a new handshake
 | 
			
		||||
     else # no protocol defined for some reason, determine TLS versions offered with a new handshake
 | 
			
		||||
          $OPENSSL s_client $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY >$TMPFILE 2>$ERRFILE </dev/null
 | 
			
		||||
          case "$(get_protocol $TMPFILE)" in
 | 
			
		||||
               *1.2)  tls_hexcode="x03, x03" ;;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user