| Revision | f54e0948a532801919c197b09af167b9af0148c1 (tree) |
|---|---|
| Time | 2011-05-08 04:31:48 |
| Author | Takuya Ono <takuya-o@user...> |
| Commiter | Takuya Ono |
MOD: Use default cacerts KeyStore file.
deploy/mdc.zip (diff)
src/org/jent/checksmtp/ssl/RespondingX509TrustManager.java (diff)| @@ -30,60 +30,10 @@ public class RespondingX509TrustManager implements X509TrustManager { | ||
| 30 | 30 | |
| 31 | 31 | public RespondingX509TrustManager() throws Exception { |
| 32 | 32 | // create a "default" JSSE X509TrustManager. |
| 33 | - File file = null; | |
| 34 | - FileInputStream cacertsFileInputStream = null; | |
| 35 | - char cacertsPass[] = null; | |
| 36 | - | |
| 37 | - //Create&load KeyStore | |
| 38 | - KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); | |
| 39 | - //KeyStore ks = KeyStore.getInstance("JKS"); | |
| 40 | - //ks.load(new FileInputStream("trustedCerts"), "passphrase".toCharArray()); | |
| 41 | - try { | |
| 42 | - //Check file at sytem property javax.net.ssl.trustStore. | |
| 43 | - String cacertsFileName = System.getProperty("javax.net.ssl.trustStore"); | |
| 44 | - if (cacertsFileName != null) { | |
| 45 | - file = new File(cacertsFileName); | |
| 46 | - System.out.println("System property javax.net.ssl.trustStore:" | |
| 47 | - + cacertsFileName); | |
| 48 | - } | |
| 49 | - if (file == null) { | |
| 50 | - //Check Default trustStore | |
| 51 | - char SEP = File.separatorChar; | |
| 52 | - String cacertsDirName = System.getProperty("java.home") + SEP + "lib" | |
| 53 | - + SEP + "security"; | |
| 54 | - file = new File(cacertsDirName, "jssecacerts"); | |
| 55 | - if (!file.canRead()) { | |
| 56 | - System.err.println("NotFound:" + file.getPath()); | |
| 57 | - file = new File(cacertsDirName, "cacerts"); | |
| 58 | - } | |
| 59 | - } | |
| 60 | - if (!file.canRead()) { | |
| 61 | - System.err.println("NotFound:" + file.getPath()); | |
| 62 | - cacertsFileInputStream = null; | |
| 63 | - } else { | |
| 64 | - cacertsFileInputStream = new FileInputStream(file); | |
| 65 | - System.err.println("Load trustStore:" + file.getPath()); | |
| 66 | - String cacertsPassString = System.getProperty("javax.net.ssl.trustStorePassword"); | |
| 67 | - if (cacertsPassString != null) { | |
| 68 | - cacertsPass = cacertsPassString.toCharArray(); | |
| 69 | - } | |
| 70 | - } | |
| 71 | - } catch (NullPointerException npEx) { | |
| 72 | - npEx.printStackTrace(System.out); | |
| 73 | - cacertsFileInputStream = null; | |
| 74 | - } catch (FileNotFoundException fnfEx) { | |
| 75 | - System.err.println("CanNotRead(" + fnfEx + "):" + file.getPath()); | |
| 76 | - cacertsFileInputStream = null; | |
| 77 | - } catch (SecurityException ex) { | |
| 78 | - cacertsFileInputStream = null; | |
| 79 | - System.err.println("CanNotRead(" + ex + "):" + file.getPath()); | |
| 80 | - } | |
| 81 | - ks.load(cacertsFileInputStream, cacertsPass); | |
| 82 | - cacertsFileInputStream.close(); | |
| 83 | - | |
| 33 | + //KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); | |
| 84 | 34 | TrustManagerFactory tmf = |
| 85 | 35 | TrustManagerFactory.getInstance("PKIX"); |
| 86 | - tmf.init(ks); | |
| 36 | + tmf.init((KeyStore)null); //Default KeyStore by null argument. | |
| 87 | 37 | |
| 88 | 38 | TrustManager tms[] = tmf.getTrustManagers(); |
| 89 | 39 |
Fork