Merge pull request #2123 from enxio/3.1dev

Improvements in local variable declaration in PR #2114

testssl.sh

@@ -11160,15 +11160,16 @@ starttls_mysql_dialog() {
 }
 
 starttls_telnet_dialog() {
-     debugme echo "=== starting telnet STARTTLS dialog ==="
+     local debugpad="  > "
+     local tnres=""
+     local -i ret=0
      local msg1="
      , xff, xfb, x2e"
      local msg2="
      , xff, xfa, x2e, x01, xff, xf0
      "
-     local tnres=""
-     local ret=""
 
+     debugme echo "=== starting telnet STARTTLS dialog ==="
      socksend "${msg1}"            0    && debugme echo "${debugpad}initiated STARTTLS" &&
      socksend "${msg2}"            1    &&
      tnres=$(sockread_fast 20)          && debugme echo "read succeeded"