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

3 files changed, 27 insertions, 28 deletions

diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs
index f275492b0ad..af3243d115f 100644
--- a/csharp/test/IceSSL/configuration/AllTests.cs
+++ b/csharp/test/IceSSL/configuration/AllTests.cs
@@ -374,12 +374,12 @@ public class AllTests
                         new X509Certificate2(defaultDir + "/s_rsa_ca1.p12", "password");
                     X509Certificate2 caCert = new X509Certificate2(defaultDir + "/cacert1.pem");
 
-                    IceSSL.NativeConnectionInfo info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                    test(info.nativeCerts.Length == 2);
+                    IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                    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)
                 {
@@ -802,7 +802,7 @@ public class AllTests
                 }
                 try
                 {
-                    IceSSL.NativeConnectionInfo info;
+                    IceSSL.ConnectionInfo info;
 
                     initData = createClientProps(defaultProperties, "", "");
                     initData.properties.setProperty("IceSSL.VerifyPeer", "0");
@@ -821,8 +821,8 @@ public class AllTests
                     Test.ServerPrx server = fact.createServer(d);
                     try
                     {
-                        info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                        test(info.nativeCerts.Length == 1);
+                        info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                        test(info.certs.Length == 1);
                         test(!info.verified);
                     }
                     catch(Ice.LocalException)
@@ -840,8 +840,8 @@ public class AllTests
                     server = fact.createServer(d);
                     try
                     {
-                        info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                        test(info.nativeCerts.Length == 1);
+                        info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                        test(info.certs.Length == 1);
                         test(!info.verified);
                     }
                     catch(Ice.LocalException)
@@ -860,8 +860,8 @@ public class AllTests
                     server = fact.createServer(d);
                     try
                     {
-                        info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                        test(info.nativeCerts.Length == 1); // Like the SChannel transport, .NET never sends the root.
+                        info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                        test(info.certs.Length == 1); // Like the SChannel transport, .NET never sends the root.
                     }
                     catch(Ice.LocalException)
                     {
@@ -886,8 +886,8 @@ public class AllTests
                         server = fact.createServer(d);
                         try
                         {
-                            info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                            test(info.nativeCerts.Length == 2);
+                            info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                            test(info.certs.Length == 2);
                             test(info.verified);
                         }
                         catch(Ice.LocalException)
@@ -946,8 +946,8 @@ public class AllTests
                         server = fact.createServer(d);
                         try
                         {
-                            info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                            test(info.nativeCerts.Length == 3);
+                            info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                            test(info.certs.Length == 3);
                             test(info.verified);
                         }
                         catch(Ice.LocalException)
@@ -991,8 +991,8 @@ public class AllTests
                         server = fact.createServer(d);
                         try
                         {
-                            info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
-                            test(info.nativeCerts.Length == 4);
+                            info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
+                            test(info.certs.Length == 4);
                             test(info.verified);
                         }
                         catch(Ice.LocalException)
@@ -1087,8 +1087,7 @@ public class AllTests
                 Test.ServerPrx server = fact.createServer(d);
                 try
                 {
-                    IceSSL.NativeConnectionInfo info =
-                        (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
+                    IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo();
                     server.checkCipher(info.cipher);
                 }
                 catch(Ice.LocalException)
diff --git a/csharp/test/IceSSL/configuration/CertificateVerifierI.cs b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
index 47be15a4b83..bd3c549c18c 100644
--- a/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
+++ b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
@@ -16,9 +16,9 @@ public class CertificateVerifierI : IceSSL.CertificateVerifier
         reset();
     }
 
-    public bool verify(IceSSL.NativeConnectionInfo info)
+    public bool verify(IceSSL.ConnectionInfo info)
     {
-        _hadCert = info.nativeCerts != null;
+        _hadCert = info.certs != null;
         _invoked = true;
         return _returnValue;
     }
diff --git a/csharp/test/IceSSL/configuration/TestI.cs b/csharp/test/IceSSL/configuration/TestI.cs
index f05b8198741..01918d96a96 100644
--- a/csharp/test/IceSSL/configuration/TestI.cs
+++ b/csharp/test/IceSSL/configuration/TestI.cs
@@ -24,8 +24,8 @@ internal sealed class ServerI : ServerDisp_
     {
         try
         {
-            IceSSL.NativeConnectionInfo info = (IceSSL.NativeConnectionInfo)current.con.getInfo();
-            test(info.nativeCerts == null);
+            IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)current.con.getInfo();
+            test(info.certs == null);
         }
         catch(Ice.LocalException)
         {
@@ -38,11 +38,11 @@ internal sealed class ServerI : ServerDisp_
     {
         try
         {
-            IceSSL.NativeConnectionInfo info = (IceSSL.NativeConnectionInfo)current.con.getInfo();
+            IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)current.con.getInfo();
             test(info.verified);
-            test(info.nativeCerts.Length == 2 &&
-                 info.nativeCerts[0].Subject.Equals(subjectDN) &&
-                 info.nativeCerts[0].Issuer.Equals(issuerDN));
+            test(info.certs.Length == 2 &&
+                 info.certs[0].Subject.Equals(subjectDN) &&
+                 info.certs[0].Issuer.Equals(issuerDN));
         }
         catch(Ice.LocalException)
         {
@@ -55,7 +55,7 @@ internal sealed class ServerI : ServerDisp_
     {
         try
         {
-            IceSSL.NativeConnectionInfo info = (IceSSL.NativeConnectionInfo)current.con.getInfo();
+            IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)current.con.getInfo();
             test(info.cipher.Equals(cipher));
         }
         catch(Ice.LocalException)