Merge pull request #1617 from dcooper16/backport_1609_and_1616

Backport #1609 and #1616
This commit is contained in:
Dirk Wetter 2020-05-06 16:34:57 +02:00 committed by GitHub
commit f49d73498a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11738,11 +11738,12 @@ parse_tls_serverhello() {
[[ $DEBUG -ge 1 ]] && tmpfile_handle ${FUNCNAME[0]}.txt
return 3
fi
elif [[ $tls_content_type != 14 ]] && [[ $tls_content_type != 15 ]] && \
fi
if [[ $tls_content_type != 14 ]] && [[ $tls_content_type != 15 ]] && \
[[ $tls_content_type != 16 ]] && [[ $tls_content_type != 17 ]]; then
debugme tmln_warning "Content type other than alert, handshake, change cipher spec, or application data detected."
[[ $DEBUG -ge 1 ]] && tmpfile_handle ${FUNCNAME[0]}.txt
return 8
return 1
elif [[ "${tls_protocol:0:2}" != 03 ]]; then
debugme tmln_warning "Protocol record_version.major is not 03."
[[ $DEBUG -ge 1 ]] && tmpfile_handle ${FUNCNAME[0]}.txt