Rename this._tls to this.secureConnection and fold into options

Allow insecure cleartext if options.insecureAuth == true

Author: ZJONSSON

lib/protocol/Auth.js

@@ -2,14 +2,14 @@ var Buffer = require('safe-buffer').Buffer;
 var Crypto = require('crypto');
 var Auth   = exports;
 
-function auth(name, data, options, isSecure) {
+function auth(name, data, options) {
   options = options || {};
 
   switch (name) {
     case 'mysql_native_password':
       return Auth.token(options.password, data.slice(0, 20));
     case 'mysql_clear_password':
-      if (!isSecure) {
+      if (!options.secureConnection && !options.insecureAuth) {
         throw new Error('Authentication method mysql_clear_password not supported on insecure connections');
       } else {
         return Buffer.from(options.password);

lib/protocol/sequences/Handshake.js

@@ -38,8 +38,10 @@ Handshake.prototype['AuthSwitchRequestPacket'] = function (packet) {
   var data, error;
   try {
     data = Auth.auth(name, packet.authMethodData, {
-      password: this._config.password
-    }, this._tls);
+      password         : this._config.password,
+      insecureAuth     : this._config.insecureAuth,
+      secureConnection : this._secureConnection
+    });
   } catch (e) {
     error = e;
   }
@@ -87,7 +89,7 @@ Handshake.prototype['HandshakeInitializationPacket'] = function(packet) {
 };
 
 Handshake.prototype._tlsUpgradeCompleteHandler = function() {
-  this._tls = true;
+  this._secureConnection = true;
   this._sendCredentials();
 };