moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Use NewIbmX509 on IBM JDK instead of NewSunX509 SSL algorithm implementation 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2077 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2013-04-04 22:35:25 +00:00
parent 67d665ff5f
commit 991399c7fb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/davmail/http/DavGatewaySSLProtocolSocketFactory.java
View File

@ -107,8 +107,13 @@ public class DavGatewaySSLProtocolSocketFactory implements SecureProtocolSocketF
}
SunPKCS11ProviderHandler.registerProvider(pkcs11Buffer.toString());
}
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(/*KeyManagerFactory.getDefaultAlgorithm()*/"NewSunX509");
String algorithm = KeyManagerFactory.getDefaultAlgorithm();
if ("SunX509".equals(algorithm)) {
algorithm = "NewSunX509";
} else if ("IbmX509".equals(algorithm)) {
algorithm = "NewIbmX509";
}
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
ArrayList<KeyStore.Builder> keyStoreBuilders = new ArrayList<KeyStore.Builder>();
// PKCS11 (smartcard) keystore with password callback