Skip to content

Commit aaa87aa

Browse files
Nicolas-Duboc-IBMvietj
authored andcommitted
Use a long password on generated in-memory KeyStore
1 parent 5968fdc commit aaa87aa

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/io/vertx/core/net/impl/KeyStoreHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
public class KeyStoreHelper {
6666

6767
// Dummy password for encrypting pem based stores in memory
68-
public static final String DUMMY_PASSWORD = "dummy";
68+
public static final String DUMMY_PASSWORD = "dummdummydummydummydummydummydummy"; // at least 32 characters for compat with FIPS mode
6969
private static final String DUMMY_CERT_ALIAS = "cert-";
7070

7171
private static final Pattern BEGIN_PATTERN = Pattern.compile("-----BEGIN ([A-Z ]+)-----");
@@ -163,10 +163,10 @@ public static KeyManagerFactory toKeyManagerFactory(X509KeyManager mgr) throws E
163163
String keyStoreType = KeyStore.getDefaultType();
164164
KeyStore ks = KeyStore.getInstance(keyStoreType);
165165
ks.load(null, null);
166-
ks.setKeyEntry("key", mgr.getPrivateKey(null), new char[0], mgr.getCertificateChain(null));
166+
ks.setKeyEntry("key", mgr.getPrivateKey(null), DUMMY_PASSWORD.toCharArray(), mgr.getCertificateChain(null));
167167
String keyAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
168168
KeyManagerFactory kmf = KeyManagerFactory.getInstance(keyAlgorithm);
169-
kmf.init(ks, new char[0]);
169+
kmf.init(ks, DUMMY_PASSWORD.toCharArray());
170170
return kmf;
171171
}
172172

src/test/java/io/vertx/core/net/KeyStoreHelperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ private void assertKeyType(KeyStore store, Class<?> expectedKeyType) throws KeyS
8989
assertTrue(store.size() > 0);
9090
for (Enumeration<String> e = store.aliases(); e.hasMoreElements(); ) {
9191
String alias = e.nextElement();
92-
// "dummy" is the password set by KeyStoreHelper when importing the
92+
// "dummdummydummydummydummydummydummy" is the password set by KeyStoreHelper when importing the
9393
// keys into the internal key store
94-
assertThat(store.getKey(alias, "dummy".toCharArray()), instanceOf(expectedKeyType));
94+
assertThat(store.getKey(alias, "dummdummydummydummydummydummydummy".toCharArray()), instanceOf(expectedKeyType));
9595
assertThat(store.getCertificate(alias), instanceOf(X509Certificate.class));
9696
}
9797
}

0 commit comments

Comments
 (0)