diff --git a/core/src/main/java/ch/cyberduck/core/ssl/CertificateStoreX509KeyManager.java b/core/src/main/java/ch/cyberduck/core/ssl/CertificateStoreX509KeyManager.java index 69811ac34e8..d872970f52d 100644 --- a/core/src/main/java/ch/cyberduck/core/ssl/CertificateStoreX509KeyManager.java +++ b/core/src/main/java/ch/cyberduck/core/ssl/CertificateStoreX509KeyManager.java @@ -141,6 +141,7 @@ public List list() { catch(ConcurrentException | KeyStoreException e) { log.error(String.format("Keystore not loaded %s", e.getMessage())); } + list.sort(String::compareTo); return list; } diff --git a/core/src/main/java/ch/cyberduck/core/ssl/KeychainX509KeyManager.java b/core/src/main/java/ch/cyberduck/core/ssl/KeychainX509KeyManager.java index c8b79c2ee92..f893d43bb3c 100644 --- a/core/src/main/java/ch/cyberduck/core/ssl/KeychainX509KeyManager.java +++ b/core/src/main/java/ch/cyberduck/core/ssl/KeychainX509KeyManager.java @@ -68,7 +68,9 @@ public List list() { if(aliases.isEmpty()) { aliases.addAll(super.list()); } - return new ArrayList<>(aliases); + final ArrayList list = new ArrayList<>(aliases); + list.sort(String::compareTo); + return list; } protected String find(final Key key) {