Merge branch '1.x' into 2.x

wildfly-security · Sep 13, 2022 · 2a39342 · 2a39342
2 parents 9c4de97 + 7cf18dc
commit 2a39342
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ Welcome to the WildFly Elytron project! We welcome contributions from the commun
 
 - [Forking the Project](#forking-the-project)
 - [Issues](#issues)
-  * [Good First Issues](#good-first-issues)
+  - [Good First Issues](#good-first-issues)
 - [Setting up your Developer Environment](#setting-up-your-developer-environment)
 - [Contributing Guidelines](#contributing-guidelines)
 - [Community](#community)
@@ -55,6 +55,8 @@ You will need:
 * An [IDE](https://en.wikipedia.org/wiki/Comparison_of_integrated_development_environments#Java)
 (e.g., [IntelliJ IDEA](https://www.jetbrains.com/idea/download/), [Eclipse](https://www.eclipse.org/downloads/), etc.)
 
+For instructions that will walk you through how to install Git, Java, and Maven for your operating system, and show you how to fork and clone the WildFly Elytron project, take a look at our [setup guides](https://wildfly-security.github.io/wildfly-elytron/guides/).
+
 First `cd` to the directory where you cloned the project (eg: `cd wildfly-elytron`)
 
 Add a remote ref to upstream, for pulling future updates.

diff --git a/keystore/src/main/java/org/wildfly/security/keystore/KeyStoreUtil.java b/keystore/src/main/java/org/wildfly/security/keystore/KeyStoreUtil.java
@@ -150,7 +150,7 @@ private static KeyStore tryLoadKeystore(final Supplier<Provider[]> providers, fi
     private static KeyStore loadPemAsKeyStore(FileInputStream is, char[] password) throws KeyStoreException, IOException {
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         try {
-            keyStore.load(null);
+            keyStore.load(null, null);
         } catch (Exception e) {
             // won't happen
         }

diff --git a/tests/base/src/test/java/org/wildfly/security/ldap/KeyStoreSuiteChild.java b/tests/base/src/test/java/org/wildfly/security/ldap/KeyStoreSuiteChild.java
@@ -185,7 +185,7 @@ public void testSetCertificateEntryUpdate() throws Exception {
 
     @Test
     public void testSetKeyEntry() throws Exception {
-        keyStore.load(null);
+        keyStore.load(null, null);
         Certificate[] chain = keyStore.getCertificateChain("firefly");
         Key key = keyStore.getKey("firefly", "Elytron".toCharArray());
         keyStore.setKeyEntry("newkey", key, "Elytron".toCharArray(), chain);