X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FSSLPinger.java;h=71612920b88cb2b809868f5a439992b8a2c0366c;hb=9efe305311c7e9f78a41093d2e2e9c57bfd10c7b;hp=33b0a6223e4719832eb1a76e3cb9445df682a152;hpb=558fcecb74036f5d51aed13a784237c3d9703906;p=gigi.git diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java index 33b0a622..71612920 100644 --- a/src/org/cacert/gigi/ping/SSLPinger.java +++ b/src/org/cacert/gigi/ping/SSLPinger.java @@ -168,25 +168,24 @@ public class SSLPinger extends DomainPinger { TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509"); tmf.init(truststore); sc.init(null, new TrustManager[] { - new X509TrustManager() { + new X509TrustManager() { - @Override - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return null; - } + @Override + public java.security.cert.X509Certificate[] getAcceptedIssuers() { + return null; + } - @Override - public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException { - java.security.cert.X509Certificate c = chain[0]; - if ( !c.getExtendedKeyUsage().contains("1.3.6.1.5.5.7.3.1")) { - System.out.println(c.getExtendedKeyUsage()); - throw new java.security.cert.CertificateException("Illegal EKU"); + @Override + public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException { + java.security.cert.X509Certificate c = chain[0]; + if ( !c.getExtendedKeyUsage().contains("1.3.6.1.5.5.7.3.1")) { + throw new java.security.cert.CertificateException("Illegal EKU"); + } } - } - @Override - public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException {} - } + @Override + public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException {} + } }, new SecureRandom()); } catch (KeyManagementException e) { e.printStackTrace(); @@ -273,17 +272,16 @@ public class SSLPinger extends DomainPinger { } return PING_SUCCEDED; } catch (GeneralSecurityException e) { - e.printStackTrace(); + // e.printStackTrace(); return "Security failed"; } catch (SSLException e) { - e.printStackTrace(); // e.printStackTrace(); TODO log for user debugging? return "Security failed"; } catch (IOException e) { // e.printStackTrace(); TODO log for user debugging? return "Connection closed"; } catch (CertificateException e) { - e.printStackTrace(); + // e.printStackTrace(); return "Security failed"; } }