diff --git a/testssl.sh b/testssl.sh index ad1a9f1..fc2295a 100755 --- a/testssl.sh +++ b/testssl.sh @@ -6883,11 +6883,18 @@ starttls_line() { return 0 } +# Line based send with newline characters appended starttls_just_send(){ debugme echo -e "C: $1" echo -ne "$1\r\n" >&5 } +# Stream based send +starttls_just_send2(){ + debugme echo -e "C: $1" + echo -ne "$1" >&5 +} + starttls_just_read(){ debugme echo "=== just read banner ===" if [[ "$DEBUG" -ge 2 ]]; then @@ -7015,9 +7022,20 @@ starttls_postgres_dialog() { starttls_mysql_dialog() { debugme echo "=== starting mysql STARTTLS dialog ===" - - debugme echo "mysql socket dialog not yet implemented" - + local login_request=" + , 20, 00, 00, 01, # payload_length, sequence_id + 85, ae, ff, 00, # capability flags, CLIENT_SSL always set + 00, 00, 00, 01, # max-packet size + 21, # character set + 00, 00, 00, 00, 00, 00, 00, 00, # string[23] reserved (all [0]) + 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00" + code2network "${login_request}" + starttls_just_read && debugme echo -e "\nreceived server greeting" && + starttls_just_send2 "$NW_STR" && debugme echo "initiated STARTTLS" + # TODO: We could detect if the server supports STARTTLS via the "Server Capabilities" + # bit field, but we'd need to parse the binary stream, with greater precision than regex. + local ret=$? debugme echo "=== finished mysql STARTTLS dialog with ${ret} ===" return $ret }