diff options
author | Jose <jose@zeroc.com> | 2019-09-06 18:49:02 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-09-06 18:52:30 +0200 |
commit | f77a9b7847525d56ba64a0631652401885457a9e (patch) | |
tree | a3283476120c498a6e28bc0712d51886e64125e3 /csharp/src | |
parent | Mark SNI support in UWP as not tested (diff) | |
download | ice-f77a9b7847525d56ba64a0631652401885457a9e.tar.bz2 ice-f77a9b7847525d56ba64a0631652401885457a9e.tar.xz ice-f77a9b7847525d56ba64a0631652401885457a9e.zip |
Enable SNI extension with CheckCertName > 1
- Remove IceSSL.ServerNameIndication, IceSSL.CheckCertName = 2 should be used
instead.
- Minor style fixes
Diffstat (limited to 'csharp/src')
-rw-r--r-- | csharp/src/Ice/PropertyNames.cs | 3 | ||||
-rw-r--r-- | csharp/src/IceSSL/TransceiverI.cs | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs index 06ea56d880c..a4b0440ead6 100644 --- a/csharp/src/Ice/PropertyNames.cs +++ b/csharp/src/Ice/PropertyNames.cs @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Aug 19 09:05:47 2019 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Sep 6 18:11:04 2019 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1118,7 +1118,6 @@ namespace IceInternal new Property(@"^IceSSL\.ProtocolVersionMin$", false, null), new Property(@"^IceSSL\.Random$", false, null), new Property(@"^IceSSL\.SchannelStrongCrypto$", false, null), - new Property(@"^IceSSL\.ServerNameIndication$", false, null), new Property(@"^IceSSL\.Trace\.Security$", false, null), new Property(@"^IceSSL\.TrustOnly$", false, null), new Property(@"^IceSSL\.TrustOnly\.Client$", false, null), diff --git a/csharp/src/IceSSL/TransceiverI.cs b/csharp/src/IceSSL/TransceiverI.cs index cc9c0db4706..90698ee5a6f 100644 --- a/csharp/src/IceSSL/TransceiverI.cs +++ b/csharp/src/IceSSL/TransceiverI.cs @@ -400,10 +400,6 @@ namespace IceSSL // // Client authentication. // - // SNI support: SslStream always sends the TLS extension (not configurable). See - // https://github.com/dotnet/corefx/issues/17427 for older versions which don't - // have it yet. Therefore, the IceSSL.ServerNameIndication property is not used here. - // _writeResult = _sslStream.BeginAuthenticateAsClient(_host, _instance.certs(), _instance.protocols(), |