diff options
Diffstat (limited to 'csharp/test/IceSSL/configuration/AllTests.cs')
| -rw-r--r-- | csharp/test/IceSSL/configuration/AllTests.cs | 37 |
1 files changed, 18 insertions, 19 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) |