Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-03-09 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2641 from testssl/sieve_fix

Browse Source 
two sieve fixes to make it work
This commit is contained in:
Dirk Wetter 2025-01-29 16:29:38 +01:00 committed by GitHub
commit aa4e9a4d41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testssl.sh
View File

@ -11500,8 +11500,7 @@ starttls_full_read(){
debugme tmln_out "${debugpad} ${one_line} "
IFS="${oldIFS}"
break
fi
if [[ ! ${one_line} =~ ${cont_pattern} ]]; then
elif [[ ! ${one_line} =~ ${cont_pattern} ]]; then
debugme echo "=== full read syntax error, expected regex pattern ${cont_pattern} (cont) or ${end_pattern} (end) ==="
IFS="${oldIFS}"
ret_found=2
@ -11607,9 +11606,9 @@ starttls_sieve_dialog() {
[[ -n "$1" ]] && starttls="$starttls\r\n$1" # this adds a payload if supplied
debugme echo "=== starting sieve STARTTLS dialog ==="
starttls_full_read '^"' '^OK ' '"STARTTLS"' "received server capabilities and checked STARTTLS availability" &&
starttls_full_read '^"' '^OK' '"STARTTLS"' "received server capabilities and checked STARTTLS availability" &&
starttls_just_send "$starttls" "initiated STARTTLS" &&
starttls_full_read '^OK ' '^OK ' '' "received ack for STARTTLS"
starttls_full_read '^OK' '^OK' '' "received ack for STARTTLS"
ret=$?
debugme echo "=== finished sieve STARTTLS dialog with ${ret} ==="
return $ret