You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/05/16 21:30:03 UTC
svn commit: r657184 -
/geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java
Author: gawor
Date: Fri May 16 12:30:03 2008
New Revision: 657184
URL: http://svn.apache.org/viewvc?rev=657184&view=rev
Log:
ignore Windows-MY and Windows-ROOT keystores (GERONIMO-3864)
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java?rev=657184&r1=657183&r2=657184&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/KeystoreUtil.java Fri May 16 12:30:03 2008
@@ -25,6 +25,7 @@
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
@@ -50,6 +51,10 @@
public static final String defaultType;
static {
+ Set<String> ignoreKeystores = new HashSet<String>();
+ ignoreKeystores.add("windows-my");
+ ignoreKeystores.add("windows-root");
+
TreeSet<String> tempKeystoreTypes = new TreeSet<String>();
TreeSet<String> tempEmptyKeystoreTypes = new TreeSet<String>();
TreeSet<String> tempCertKeystoreTypes = new TreeSet<String>();
@@ -77,8 +82,10 @@
}
for(Provider provider: providers) {
for(Provider.Service service: provider.getServices()) {
- if(service.getType().equals("KeyStore")) {
- String type = service.getAlgorithm();
+ String type = service.getAlgorithm();
+ if (service.getType().equals("KeyStore") &&
+ !ignoreKeystores.contains(type.toLowerCase())) {
+
tempKeystoreTypes.add(type);
if(type.equalsIgnoreCase(KeyStore.getDefaultType())) {
tempDefaultType = type;