I forgot that `parse_tls_serverhello()` is also called by `client_simulation_sockets()`. Since PR #499 changed the input to `parse_tls_serverhello()`, the change needs to be made in `client_simulation_sockets()` as well.
This commit is contained in:
David Cooper 2016-11-03 10:02:45 -04:00 committed by GitHub
parent a91e45035b
commit 24cc3ae73f
1 changed files with 6 additions and 1 deletions

View File

@ -2200,6 +2200,7 @@ client_simulation_sockets() {
local -i save=0 local -i save=0
local lines clienthello data="" local lines clienthello data=""
local cipher_list_2send local cipher_list_2send
local tls_hello_ascii
if [[ "${1:0:4}" == "1603" ]]; then if [[ "${1:0:4}" == "1603" ]]; then
clienthello="$(create_client_simulation_tls_clienthello "$1")" clienthello="$(create_client_simulation_tls_clienthello "$1")"
@ -2220,13 +2221,17 @@ client_simulation_sockets() {
sockread_serverhello 32768 sockread_serverhello 32768
TLS_NOW=$(LC_ALL=C date "+%s") TLS_NOW=$(LC_ALL=C date "+%s")
tls_hello_ascii=$(hexdump -v -e '16/1 "%02X"' "$SOCK_REPLY_FILE")
tls_hello_ascii="${tls_hello_ascii%%[!0-9A-F]*}"
debugme outln "reading server hello..." debugme outln "reading server hello..."
if [[ "$DEBUG" -ge 4 ]]; then if [[ "$DEBUG" -ge 4 ]]; then
hexdump -C $SOCK_REPLY_FILE | head -6 hexdump -C $SOCK_REPLY_FILE | head -6
echo echo
fi fi
parse_tls_serverhello "$SOCK_REPLY_FILE" parse_tls_serverhello "$tls_hello_ascii"
save=$? save=$?
# see https://secure.wand.net.nz/trac/libprotoident/wiki/SSL # see https://secure.wand.net.nz/trac/libprotoident/wiki/SSL