Fix for MariaDB 10.4

Fixes issue relating to MariaDB and getting a result set

Author: Chris Board

.idea/caches/build_file_checksums.ser

@@ -20,7 +20,7 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.30'
+version '0.31'
 group 'com.BoardiesITSolutions'
 
 
@@ -30,8 +30,8 @@ android {
         //applicationId "com.BoardiesITSolutions.AndroidMySQLConnector"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 21
-        versionName "0.30"
+        versionCode 22
+        versionName "0.31"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

.idea/caches/gradle_models.ser

@@ -41,6 +41,7 @@ public class Connection
     private int port = 3306;
 
     //Connection Details
+    private boolean isMariaDB = false;
     private int majorVersion;
     private int minorVersion;
     private int subMinorVersion;
@@ -137,6 +138,11 @@ public Charset getCharset() {
         }
     }
 
+    public boolean isMariaDB()
+    {
+        return isMariaDB;
+    }
+
     public int getServerLanguage()
     {
         return serverLanguage;
@@ -316,6 +322,12 @@ private void processWelcomePacket() throws MySQLConnException, IOException {
 
             serverVersion = mysqlIO.extractData(false);
 
+            if (serverVersion.contains("MariaDB"))
+            {
+                Log.d("MySQL Connection", "Detected Server as MariaDB");
+                this.isMariaDB = true;
+            }
+
             //Pass the server version in to the major, minor and subminor versions - these could
             //be used if things need to be done differently based on the server we're connecting to
             parseVersionNumber();
@@ -377,6 +389,8 @@ private void processWelcomePacket() throws MySQLConnException, IOException {
             if (this.getMajorVersion() >= 8)
             {
                 clientCapabilities &= ~CLIENT_OPTIONAL_RESULTSET_METADATA;
+                clientCapabilities &= ~CLIENT_SSL;
+
             }
 
             //Check if the server is set to don't allow database.table, if so unset it so we can
@@ -435,7 +449,7 @@ private void processWelcomePacket() throws MySQLConnException, IOException {
             }
 
             //Check if we're using TLS connection, if so we need to send an SSL Request Packet
-            if ((Connection.this.serverCapabilities & CLIENT_SSL) == CLIENT_SSL)
+            if ((Connection.this.serverCapabilities & CLIENT_SSL) == CLIENT_SSL && getMajorVersion() < 8)
             {
                 sendSSLRequest();
             }
@@ -536,17 +550,22 @@ private void performSSLHandshake()
             List<String> allowedCiphers = null;
             boolean disableDHAlgorithm = true;
 
-            if (disableDHAlgorithm) {
-                allowedCiphers = new ArrayList<String>();
-                for (String cipher : sslSocket.getEnabledCipherSuites()) {
-                    if (!(disableDHAlgorithm && (cipher.indexOf("_DHE_") > -1 || cipher.indexOf("_DH_") > -1))) {
-                        allowedCiphers.add(cipher);
-                    }
+            if (this.getMajorVersion() == 8)
+            {
+                disableDHAlgorithm = false;
+            }
+
+            String[] enabledCipherSuites = sslSocket.getEnabledCipherSuites();
+
+            allowedCiphers = new ArrayList<String>();
+            for (String cipher : enabledCipherSuites) {
+                if (!(disableDHAlgorithm && (cipher.indexOf("_DHE_") > -1 || cipher.indexOf("_DH_") > -1))) {
+                    allowedCiphers.add(cipher);
                 }
             }
 
             // if some ciphers were filtered into allowedCiphers
-            if (allowedCiphers != null) {
+            if (allowedCiphers.size() > 0) {
                 sslSocket.setEnabledCipherSuites(allowedCiphers.toArray(new String[0]));
             }
 

.idea/gradle.xml

@@ -106,6 +106,7 @@ private void createAuthenticationPacket() throws IOException
                         if (this.mysqlConn.isConnectedVersionLessThan(5,5,0)) {
                             dataOutPacket.writeByte(0x14);
                         }
+                        Log.d("AuthResponse", "Length of Hash: " + password.length + " Expected: " + this.mysqlConn.getAuthPluginDataLength());
                         dataOutPacket.write(password);
 
                         //The documentation states the password should be NULL terminated, however, if its null
@@ -152,10 +153,15 @@ private void createAuthenticationPacket() throws IOException
                     for (byte b : hash1)
                     {
                         hash3[i] = (byte) (b ^ hash2[i++]);
+                        //hash3[i] = (byte)((int)b ^ (int)hash2[i++]);
                     }
-
+                    //hash3[hash3.length-1] = 0x00;
+                    Log.d("AuthResponse", "Length of Hash: " + hash3.length + " Expected: " + this.mysqlConn.getAuthPluginDataLength());
+                    dataOutPacket.writeByte(0x20);
                     dataOutPacket.write(hash3);
 
+
+                    //dataOutPacket.writeByte(0);
                     //byte[] hash1 = sha256String(password);
                     //byte[] hash2 = sha256Bytes(hash1);
 

Android-MySQL-Connector.zip

@@ -75,7 +75,7 @@ private void processPacketData()
 
         //MySQL 5.1 appears to add an extra packet between the column definitions and the rows so we'll pass
         //it in case we need it - don't think we do though!
-        if (this.mysqlConn.isConnectedVersionLessThan(5,5,60))
+        if (this.mysqlConn.isConnectedVersionLessThan(5,5,60) && !this.mysqlConn.isMariaDB())
         {
             int packetLength = this.mysqlConn.getMysqlIO().fromByteArray((byte[]) this.mysqlConn.getMysqlIO().extractData(3));
             int packetNumber = (byte) this.mysqlConn.getMysqlIO().extractData(1);

AndroidMySQLConnector/build.gradle

@@ -30,5 +30,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.30_MySQL8'
+    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.31_MySQL8'
 }

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Connection.java

@@ -47,6 +47,7 @@ public class MainActivity extends AppCompatActivity
     private Button btnSaveDetails;
     private SharedPreferences settings;
     private Button btnAddRandomRecord;
+    private Button btnSelectRecords;
 
     //Create class instance of your connection. You should re-use this connection for
     //every action on your database.
@@ -79,6 +80,9 @@ protected void onCreate(Bundle savedInstanceState)
 
         btnAddRandomRecord = findViewById(R.id.btnAddRandomRecord);
         btnAddRandomRecord.setOnClickListener(mBtnAddRandomRecordClickListener);
+
+        btnSelectRecords = findViewById(R.id.btnSelectRecords);
+        btnSelectRecords.setOnClickListener(mBtnSelectRecordsClickListener);
     }
 
     /**
@@ -126,7 +130,7 @@ public void actionCompleted()
                     public void run()
                     {
                         Toast.makeText(MainActivity.this, "Connected to database successfully", Toast.LENGTH_SHORT).show();
-                        selectTableRecords();
+                        //selectTableRecords();
                     }
                 });
             }
@@ -228,6 +232,14 @@ public void handleException(Exception exception)
         }
     };
 
+    private View.OnClickListener mBtnSelectRecordsClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v)
+        {
+            selectTableRecords();
+        }
+    };
+
     /**
      * Retrieves all records from the database and displays it
      */