Fix for Bug#98699 (Bug#30932850), Allow empty keyStore file for keyStoreTypes that do not require files.

fjssilva · fjssilva · commit b62afb27709d · 2025-09-08T21:56:51.000+01:00
Change-Id: I589e94038c3184564adb05d285c1de76e86ebda5
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,9 @@
 
 Version 9.5.0
 
+  - Fix for Bug#98699 (Bug#30932850), Allow empty keyStore file for keyStoreTypes that do not require files.
+    Thanks to Kolbe Kegel for his contribution.
+
   - Fix for Bug#118938 (Bug#38396227), DatabaseMetaDataInformationSchema#getSchemas has a bug.
 
   - Fix for Bug#99292 (Bug#31195955), Contribution: Support Windows time zone \'Coordinated Universal Time\'.
diff --git a/src/main/core-impl/java/com/mysql/cj/protocol/ExportControlled.java b/src/main/core-impl/java/com/mysql/cj/protocol/ExportControlled.java
@@ -557,6 +557,13 @@ public SSLContext build() {
                         }
                     }
                 }
+            } else {
+                // Not all KeyManagers require a file-based keystore. If clientCertificateKeyStoreUrl is empty, still try to create a functional KeyManager.
+                try {
+                    kms = kmf.getKeyManagers();
+                } catch (IllegalStateException e) {
+                    // Ignore. No KeyManager shall be used.
+                }
             }
 
             InputStream trustStoreIS = null;

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,13 @@ public SSLContext build() {`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`	`}`
	`560`	`+ } else {`
	`561`	`+ // Not all KeyManagers require a file-based keystore. If clientCertificateKeyStoreUrl is empty, still try to create a functional KeyManager.`
	`562`	`+ try {`
	`563`	`+ kms = kmf.getKeyManagers();`
	`564`	`+ } catch (IllegalStateException e) {`
	`565`	`+ // Ignore. No KeyManager shall be used.`
	`566`	`+ }`
`560`	`567`	`}`
`561`	`568`
`562`	`569`	`InputStream trustStoreIS = null;`