Git
/
testssl.sh
mirror of https://github.com/drwetter/testssl.sh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix borken conflict resolving editing

This commit is contained in:
Dirk 2017-10-02 14:58:30 +02:00
parent 411accb66d
commit 59d4a9fa65
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testssl.sh
View File

@ -3972,21 +3972,16 @@ run_prototest_openssl() {
# arg1: protocol # arg1: protocol
# arg2: available (yes) or not (no) # arg2: available (yes) or not (no)
add_tls_offered() { add_tls_offered() {
<<<<<<< HEAD
if [[ "$PROTOS_OFFERED" =~ $1: ]]; then if [[ "$PROTOS_OFFERED" =~ $1: ]]; then
# the ":" is mandatory here (and @ other palces), otherwise e.g. tls1 will match tls1_2 # the ":" is mandatory here (and @ other palces), otherwise e.g. tls1 will match tls1_2
: :
else else
PROTOS_OFFERED+="${1}:$2 " PROTOS_OFFERED+="${1}:$2 "
fi fi
=======
[[ "$PROTOS_OFFERED" =~ "$1 " ]] || PROTOS_OFFERED+="$1 "
>>>>>>> af15bd0f002c0523579b3807949fa54c05c793e3
} }
# function which checks whether SSLv2 - TLS 1.2 is being offereed, see add_tls_offered() # function which checks whether SSLv2 - TLS 1.2 is being offereed, see add_tls_offered()
has_server_protocol() { has_server_protocol() {
<<<<<<< HEAD
local proto_val_pair local proto_val_pair
if [[ "$PROTOS_OFFERED" =~ $1: ]]; then if [[ "$PROTOS_OFFERED" =~ $1: ]]; then
@ -4004,9 +3999,6 @@ has_server_protocol() {
else else
# if empty echo 2, hinting to the caller to check at additional cost/connect # if empty echo 2, hinting to the caller to check at additional cost/connect
echo 2 echo 2
=======
if [[ "$PROTOS_OFFERED" =~ "$1 " ]]; then
>>>>>>> af15bd0f002c0523579b3807949fa54c05c793e3
return 0 return 0
fi fi
} }