Tab fix

Tazmaniac · Nov 4, 2024 · 6c992e7 · 6c992e7
1 parent f95a491
commit 6c992e7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/testssl.sh b/testssl.sh
@@ -17189,11 +17189,7 @@ run_renego() {
                sec_client_renego=1
           else
                # second try in the foreground as we are sure now it won't hang
-<<<<<<< HEAD
     	          (echo R; sleep 1) | $OPENSSL s_client $(s_client_options "$proto $legacycmd $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") >$TMPFILE 2>>$ERRFILE
-=======
-	       (echo R; sleep 1) | $OPENSSL s_client $(s_client_options "$proto $legacycmd $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") >$TMPFILE 2>>$ERRFILE
->>>>>>> b82941b09f2b2469ae7294833ca81471ff4a91b5
                sec_client_renego=$?
                # 0 means client is renegotiating & doesn't return an error --> vuln!
                # 1 means client tried to renegotiating but the server side errored then. You still see RENEGOTIATING in the output