X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fping%2FSSLPinger.java;h=6a20dafe7266384a3133248dc30d1d05ad755e61;hb=90771b77a6e7cd00bce47feeb35786f0371b89bd;hp=0b253c5f260bdda007da19b09ff16d560e68cc71;hpb=99ef9ee7f8d4a2332e4f08c7a0b23cc84966f555;p=gigi.git

diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java
index 0b253c5f..6a20dafe 100644
--- a/src/org/cacert/gigi/ping/SSLPinger.java
+++ b/src/org/cacert/gigi/ping/SSLPinger.java
@@ -19,16 +19,16 @@ import javax.net.ssl.SNIHostName;
 import javax.net.ssl.SNIServerName;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLEngineResult.Status;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLParameters;
+import javax.net.ssl.TrustManagerFactory;
 import javax.security.cert.X509Certificate;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 
 public class SSLPinger extends DomainPinger {
 
@@ -208,18 +208,18 @@ public class SSLPinger extends DomainPinger {
 
             BigInteger serial = first.getSerialNumber();
             Certificate c = Certificate.getBySerial(serial.toString(16));
-            if (c.getOwnerId() != subject.getId()) {
+            if (c.getOwner().getId() != subject.getId()) {
                 return "Owner mismatch";
             }
             return PING_SUCCEDED;
         } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
+            // e.printStackTrace(); TODO log for user debugging?
             return "Security failed";
         } catch (SSLException e) {
-            e.printStackTrace();
+            // e.printStackTrace(); TODO log for user debugging?
             return "Security failed";
         } catch (IOException e) {
-            e.printStackTrace();
+            // e.printStackTrace(); TODO log for user debugging?
             return "Connection closed";
         }
     }