Update IceSSL::ConnectionInfo to use native certs and remove NativeConnectionInfo

4 files changed, 30 insertions, 30 deletions

diff --git a/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
index c773510ff63..bdde7c379f0 100644
--- a/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/Ice/classLoader/CertificateVerifierI.java
@@ -12,7 +12,7 @@ package test.Ice.classLoader;
 public class CertificateVerifierI implements com.zeroc.IceSSL.CertificateVerifier
 {
     @Override
-    public boolean verify(com.zeroc.IceSSL.NativeConnectionInfo info)
+    public boolean verify(com.zeroc.IceSSL.ConnectionInfo info)
     {
         return true;
     }
diff --git a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 6fe3db303fa..be96d9f131f 100644
--- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
@@ -300,14 +300,14 @@ public class AllTests
                 java.security.cert.X509Certificate serverCert = loadCertificate(defaultDir + "/s_rsa_ca1.jks", "cert");
                 java.security.cert.X509Certificate caCert = loadCertificate(defaultDir + "/cacert1.jks", "ca");
 
-                com.zeroc.IceSSL.NativeConnectionInfo info =
-                    (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
+                com.zeroc.IceSSL.ConnectionInfo info =
+                    (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
 
-                test(info.nativeCerts.length == 2);
+                test(info.certs.length == 2);
                 test(info.verified);
 
-                test(caCert.equals(info.nativeCerts[1]));
-                test(serverCert.equals(info.nativeCerts[0]));
+                test(caCert.equals(info.certs[1]));
+                test(serverCert.equals(info.certs[0]));
             }
             catch(Exception ex)
             {
@@ -776,7 +776,7 @@ public class AllTests
         out.print("testing certificate chains... ");
         out.flush();
         {
-            com.zeroc.IceSSL.NativeConnectionInfo info;
+            com.zeroc.IceSSL.ConnectionInfo info;
 
             initData = createClientProps(defaultProperties, "", "");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
@@ -795,8 +795,8 @@ public class AllTests
             ServerPrx server = fact.createServer(d);
             try
             {
-                info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                test(info.nativeCerts.length == 1);
+                info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                test(info.certs.length == 1);
                 test(!info.verified);
             }
             catch(com.zeroc.Ice.LocalException ex)
@@ -814,8 +814,8 @@ public class AllTests
             server = fact.createServer(d);
             try
             {
-                info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                test(info.nativeCerts.length == 1);
+                info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                test(info.certs.length == 1);
                 test(!info.verified);
             }
             catch(com.zeroc.Ice.LocalException ex)
@@ -834,8 +834,8 @@ public class AllTests
             server = fact.createServer(d);
             try
             {
-                info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                test(info.nativeCerts.length == 2);
+                info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                test(info.certs.length == 2);
             }
             catch(com.zeroc.Ice.LocalException ex)
             {
@@ -860,8 +860,8 @@ public class AllTests
                 server = fact.createServer(d);
                 try
                 {
-                    info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                    test(info.nativeCerts.length == 2);
+                    info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                    test(info.certs.length == 2);
                     test(info.verified);
                 }
                 catch(com.zeroc.Ice.LocalException ex)
@@ -922,8 +922,8 @@ public class AllTests
                 server = fact.createServer(d);
                 try
                 {
-                    info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                    test(info.nativeCerts.length == 3);
+                    info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                    test(info.certs.length == 3);
                     test(info.verified);
                 }
                 catch(com.zeroc.Ice.LocalException ex)
@@ -967,8 +967,8 @@ public class AllTests
                 server = fact.createServer(d);
                 try
                 {
-                    info = (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                    test(info.nativeCerts.length == 4);
+                    info = (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                    test(info.certs.length == 4);
                     test(info.verified);
                 }
                 catch(com.zeroc.Ice.LocalException ex)
@@ -1060,8 +1060,8 @@ public class AllTests
             {
                 String cipherSub = "DH_anon";
                 server.checkCipher(cipherSub);
-                com.zeroc.IceSSL.NativeConnectionInfo info =
-                    (com.zeroc.IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
+                com.zeroc.IceSSL.ConnectionInfo info =
+                    (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
                 test(info.cipher.indexOf(cipherSub) >= 0);
             }
             catch(com.zeroc.Ice.LocalException ex)
diff --git a/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
index a1b885f68ea..5638677a435 100644
--- a/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/CertificateVerifierI.java
@@ -17,14 +17,14 @@ public class CertificateVerifierI implements com.zeroc.IceSSL.CertificateVerifie
     }
 
     @Override
-    public boolean verify(com.zeroc.IceSSL.NativeConnectionInfo info)
+    public boolean verify(com.zeroc.IceSSL.ConnectionInfo info)
     {
-        if(info.nativeCerts != null)
+        if(info.certs != null)
         {
             try
             {
                 java.util.Collection<java.util.List<?> > subjectAltNames =
-                    ((java.security.cert.X509Certificate)info.nativeCerts[0]).getSubjectAlternativeNames();
+                    ((java.security.cert.X509Certificate)info.certs[0]).getSubjectAlternativeNames();
                 test(subjectAltNames != null);
                 java.util.List<String> ipAddresses = new java.util.ArrayList<>();
                 java.util.List<String> dnsNames = new java.util.ArrayList<>();
@@ -51,7 +51,7 @@ public class CertificateVerifierI implements com.zeroc.IceSSL.CertificateVerifie
             }
         }
 
-        _hadCert = info.nativeCerts != null;
+        _hadCert = info.certs != null;
         _invoked = true;
         return _returnValue;
     }
diff --git a/java/test/src/main/java/test/IceSSL/configuration/ServerI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
index 742eb5908b0..f6869a155ab 100644
--- a/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/ServerI.java
@@ -23,7 +23,7 @@ class ServerI implements Server
     {
         try
         {
-            com.zeroc.IceSSL.NativeConnectionInfo info = (com.zeroc.IceSSL.NativeConnectionInfo)current.con.getInfo();
+            com.zeroc.IceSSL.ConnectionInfo info = (com.zeroc.IceSSL.ConnectionInfo)current.con.getInfo();
             test(info.certs == null);
         }
         catch(com.zeroc.Ice.LocalException ex)
@@ -38,10 +38,10 @@ class ServerI implements Server
     {
         try
         {
-            com.zeroc.IceSSL.NativeConnectionInfo info = (com.zeroc.IceSSL.NativeConnectionInfo)current.con.getInfo();
-            java.security.cert.X509Certificate cert = (java.security.cert.X509Certificate)info.nativeCerts[0];
+            com.zeroc.IceSSL.ConnectionInfo info = (com.zeroc.IceSSL.ConnectionInfo)current.con.getInfo();
+            java.security.cert.X509Certificate cert = (java.security.cert.X509Certificate)info.certs[0];
             test(info.verified);
-            test(info.nativeCerts.length == 2 &&
+            test(info.certs.length == 2 &&
                  cert.getSubjectDN().toString().equals(subjectDN) &&
                  cert.getIssuerDN().toString().equals(issuerDN));
         }
@@ -56,7 +56,7 @@ class ServerI implements Server
     {
         try
         {
-            com.zeroc.IceSSL.NativeConnectionInfo info = (com.zeroc.IceSSL.NativeConnectionInfo)current.con.getInfo();
+            com.zeroc.IceSSL.ConnectionInfo info = (com.zeroc.IceSSL.ConnectionInfo)current.con.getInfo();
             test(info.cipher.indexOf(cipher) >= 0);
         }
         catch(com.zeroc.Ice.LocalException ex)