diff options
author | Stano Peťko <stano@stanopetko.eu> | 2017-10-26 06:58:58 +0300 |
---|---|---|
committer | Stephen Toub <stoub@microsoft.com> | 2017-10-26 06:58:58 +0300 |
commit | 56623123ed2dcf664499c297c1652c68de623769 (patch) | |
tree | e76c3a8e005b60a3a73d129243301e2da8027222 /src | |
parent | 41a72f2cfbf0a504febe8f3c5bd67c29f876fdfa (diff) |
Remove dead code from System.Net.Security (#24816)
* Deleted dead code from System.Net.Security.
* Returned back strings used in other platforms.
* Returned back strings used in OSX platform.
* Returned back event_ strings.
Diffstat (limited to 'src')
3 files changed, 63 insertions, 42 deletions
diff --git a/src/System.Net.Security/src/Resources/Strings.resx b/src/System.Net.Security/src/Resources/Strings.resx index 6fafaafd89..8b2b4266da 100644 --- a/src/System.Net.Security/src/Resources/Strings.resx +++ b/src/System.Net.Security/src/Resources/Strings.resx @@ -1,5 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> <root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> @@ -70,9 +129,6 @@ <data name="net_MethodNotImplementedException" xml:space="preserve"> <value>This method is not implemented by this class.</value> </data> - <data name="net_completed_result" xml:space="preserve"> - <value>This operation cannot be performed on a completed asynchronous result object.</value> - </data> <data name="net_io_readfailure" xml:space="preserve"> <value>Unable to read data from the transport connection: {0}.</value> </data> @@ -295,9 +351,6 @@ <data name="net_ssl_encrypt_failed" xml:space="preserve"> <value>Encrypt failed with OpenSSL error - {0}.</value> </data> - <data name="net_get_ssl_method_failed" xml:space="preserve"> - <value>Failed to get SSL method '{0}'. Ensure the OpenSSL method exists on the current system.</value> - </data> <data name="net_ssl_check_private_key_failed" xml:space="preserve"> <value>SSL certificate private key check failed with OpenSSL error - {0}.</value> </data> @@ -355,7 +408,7 @@ <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve"> <value>Target name should be non empty if default credentials are passed.</value> </data> - <data name="net_security_sslprotocol_contiguous"> + <data name="net_security_sslprotocol_contiguous" xml:space="preserve"> <value>The requested combination of SslProtocols ({0}) is not valid for this platform because it skips intermediate versions.</value> </data> <data name="net_encryptionpolicy_notsupported" xml:space="preserve"> @@ -373,4 +426,4 @@ <data name="net_conflicting_options" xml:space="preserve"> <value>The '{0}' option was already set in the SslStream constructor.</value> </data> -</root> +</root>
\ No newline at end of file diff --git a/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs b/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs index f3a8d0ac05..5c85adbf22 100644 --- a/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs +++ b/src/System.Net.Security/src/System/Net/Security/SecureChannel.cs @@ -15,7 +15,7 @@ using System.Security.Cryptography.X509Certificates; namespace System.Net.Security { - // SecureChannel - a wrapper on SSPI based functionality. + // SecureChannel - a wrapper on SSPI based functionality. // Provides an additional abstraction layer over SSPI for SslStream. internal class SecureChannel { @@ -122,14 +122,6 @@ namespace System.Net.Security } } - internal int HeaderSize - { - get - { - return _headerSize; - } - } - internal int MaxDataSize { get @@ -938,7 +930,7 @@ namespace System.Net.Security } byte[] writeBuffer = output; - + SecurityStatusPal secStatus = SslStreamPal.EncryptMessage( _securityContext, buffer, diff --git a/src/System.Net.Security/src/System/Net/Security/SslState.cs b/src/System.Net.Security/src/System/Net/Security/SslState.cs index 3fd95ad1b9..2ef9b71add 100644 --- a/src/System.Net.Security/src/System/Net/Security/SslState.cs +++ b/src/System.Net.Security/src/System/Net/Security/SslState.cs @@ -32,7 +32,6 @@ namespace System.Net.Security private SecureChannel _context; private bool _handshakeCompleted; - private bool _certValidationFailed; private bool _shutdown; private SecurityStatusPal _securityStatus; @@ -230,19 +229,6 @@ namespace System.Net.Security } } - internal SecurityStatusPal LastSecurityStatus - { - get { return _securityStatus; } - } - - internal bool IsCertValidationFailed - { - get - { - return _certValidationFailed; - } - } - internal bool IsShutdown { get @@ -407,14 +393,6 @@ namespace System.Net.Security } } - internal int HeaderSize - { - get - { - return Context.HeaderSize; - } - } - internal int MaxDataSize { get @@ -1041,14 +1019,12 @@ namespace System.Net.Security if (!Context.VerifyRemoteCertificate(_sslAuthenticationOptions.CertValidationDelegate, ref alertToken)) { _handshakeCompleted = false; - _certValidationFailed = true; if (NetEventSource.IsEnabled) NetEventSource.Exit(this, false); return false; } - _certValidationFailed = false; _handshakeCompleted = true; if (NetEventSource.IsEnabled) |