[Mono.Security]: Actually rename MonoSslStream.cs into IMonoSslStream.cs.
authorMartin Baulig <martin.baulig@xamarin.com>
Wed, 25 Nov 2015 23:45:31 +0000 (18:45 -0500)
committerMartin Baulig <martin.baulig@xamarin.com>
Wed, 25 Nov 2015 23:46:50 +0000 (18:46 -0500)
(cherry picked from commit 6609e2719437fe2bc20546908053fb4c4f7f80d2)

mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs [new file with mode: 0644]
mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs [deleted file]
mcs/class/Mono.Security/Mono.Security.dll.sources
mcs/class/Mono.Security/xammac_Mono.Security.dll.sources
mcs/class/System/mobile_static_System.dll.sources
mcs/class/System/monodroid_System.dll.sources
mcs/class/System/monotouch_System.dll.sources

diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs b/mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
new file mode 100644 (file)
index 0000000..ae7a929
--- /dev/null
@@ -0,0 +1,188 @@
+//
+// IMonoSslStream.cs
+//
+// Author:
+//       Martin Baulig <martin.baulig@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Threading.Tasks;
+using SSA = System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Principal;
+using System.Security.Cryptography;
+using Mono.Net.Security;
+
+namespace Mono.Security.Interface
+{
+       public interface IMonoSslStream : IDisposable
+       {
+               void AuthenticateAsClient (string targetHost);
+
+               void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState);
+
+               IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
+
+               void EndAuthenticateAsClient (IAsyncResult asyncResult);
+
+               void AuthenticateAsServer (X509Certificate serverCertificate);
+
+               void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState);
+
+               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
+
+               void EndAuthenticateAsServer (IAsyncResult asyncResult);
+
+               Task AuthenticateAsClientAsync (string targetHost);
+
+               Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               Task AuthenticateAsServerAsync (X509Certificate serverCertificate);
+
+               Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
+
+               void Flush ();
+
+               int Read (byte[] buffer, int offset, int count);
+
+               void Write (byte[] buffer);
+
+               void Write (byte[] buffer, int offset, int count);
+
+               IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
+
+               int EndRead (IAsyncResult asyncResult);
+
+               IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
+
+               void EndWrite (IAsyncResult asyncResult);
+
+               TransportContext TransportContext {
+                       get;
+               }
+
+               bool IsAuthenticated {
+                       get;
+               }
+
+               bool IsMutuallyAuthenticated {
+                       get;
+               }
+
+               bool IsEncrypted {
+                       get;
+               }
+
+               bool IsSigned {
+                       get;
+               }
+
+               bool IsServer {
+                       get;
+               }
+
+               SSA.CipherAlgorithmType CipherAlgorithm {
+                       get;
+               }
+
+               int CipherStrength {
+                       get;
+               }
+
+               SSA.HashAlgorithmType HashAlgorithm {
+                       get;
+               }
+
+               int HashStrength {
+                       get;
+               }
+
+               SSA.ExchangeAlgorithmType KeyExchangeAlgorithm {
+                       get;
+               }
+
+               int KeyExchangeStrength {
+                       get;
+               }
+
+               bool CanRead {
+                       get;
+               }
+
+               bool CanTimeout {
+                       get;
+               }
+
+               bool CanWrite {
+                       get;
+               }
+
+               long Length {
+                       get;
+               }
+
+               long Position {
+                       get;
+               }
+
+               void SetLength (long value);
+
+               AuthenticatedStream AuthenticatedStream {
+                       get;
+               }
+
+               int ReadTimeout {
+                       get; set;
+               }
+
+               int WriteTimeout {
+                       get; set;
+               }
+
+               bool CheckCertRevocationStatus {
+                       get;
+               }
+
+               X509Certificate InternalLocalCertificate {
+                       get;
+               }
+
+               X509Certificate LocalCertificate {
+                       get;
+               }
+
+               X509Certificate RemoteCertificate {
+                       get;
+               }
+
+               SSA.SslProtocols SslProtocol {
+                       get;
+               }
+       }
+}
+
diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoSslStream.cs
deleted file mode 100644 (file)
index 4cf1417..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-//
-// MonoSslStream.cs
-//
-// Author:
-//       Martin Baulig <martin.baulig@xamarin.com>
-//
-// Copyright (c) 2015 Xamarin, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Security;
-using System.Threading.Tasks;
-using SSA = System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Security.Principal;
-using System.Security.Cryptography;
-using Mono.Net.Security;
-
-namespace Mono.Security.Interface
-{
-       public interface IMonoSslStream : IDisposable
-       {
-               void AuthenticateAsClient (string targetHost);
-
-               void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               IAsyncResult BeginAuthenticateAsClient (string targetHost, AsyncCallback asyncCallback, object asyncState);
-
-               IAsyncResult BeginAuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
-
-               void EndAuthenticateAsClient (IAsyncResult asyncResult);
-
-               void AuthenticateAsServer (X509Certificate serverCertificate);
-
-               void AuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, AsyncCallback asyncCallback, object asyncState);
-
-               IAsyncResult BeginAuthenticateAsServer (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation, AsyncCallback asyncCallback, object asyncState);
-
-               void EndAuthenticateAsServer (IAsyncResult asyncResult);
-
-               Task AuthenticateAsClientAsync (string targetHost);
-
-               Task AuthenticateAsClientAsync (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               Task AuthenticateAsServerAsync (X509Certificate serverCertificate);
-
-               Task AuthenticateAsServerAsync (X509Certificate serverCertificate, bool clientCertificateRequired, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
-
-               void Flush ();
-
-               int Read (byte[] buffer, int offset, int count);
-
-               void Write (byte[] buffer);
-
-               void Write (byte[] buffer, int offset, int count);
-
-               IAsyncResult BeginRead (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
-
-               int EndRead (IAsyncResult asyncResult);
-
-               IAsyncResult BeginWrite (byte[] buffer, int offset, int count, AsyncCallback asyncCallback, object asyncState);
-
-               void EndWrite (IAsyncResult asyncResult);
-
-               TransportContext TransportContext {
-                       get;
-               }
-
-               bool IsAuthenticated {
-                       get;
-               }
-
-               bool IsMutuallyAuthenticated {
-                       get;
-               }
-
-               bool IsEncrypted {
-                       get;
-               }
-
-               bool IsSigned {
-                       get;
-               }
-
-               bool IsServer {
-                       get;
-               }
-
-               SSA.CipherAlgorithmType CipherAlgorithm {
-                       get;
-               }
-
-               int CipherStrength {
-                       get;
-               }
-
-               SSA.HashAlgorithmType HashAlgorithm {
-                       get;
-               }
-
-               int HashStrength {
-                       get;
-               }
-
-               SSA.ExchangeAlgorithmType KeyExchangeAlgorithm {
-                       get;
-               }
-
-               int KeyExchangeStrength {
-                       get;
-               }
-
-               bool CanRead {
-                       get;
-               }
-
-               bool CanTimeout {
-                       get;
-               }
-
-               bool CanWrite {
-                       get;
-               }
-
-               long Length {
-                       get;
-               }
-
-               long Position {
-                       get;
-               }
-
-               void SetLength (long value);
-
-               AuthenticatedStream AuthenticatedStream {
-                       get;
-               }
-
-               int ReadTimeout {
-                       get; set;
-               }
-
-               int WriteTimeout {
-                       get; set;
-               }
-
-               bool CheckCertRevocationStatus {
-                       get;
-               }
-
-               X509Certificate InternalLocalCertificate {
-                       get;
-               }
-
-               X509Certificate LocalCertificate {
-                       get;
-               }
-
-               X509Certificate RemoteCertificate {
-                       get;
-               }
-
-               SSA.SslProtocols SslProtocol {
-                       get;
-               }
-       }
-}
-
index c4828006171f910567402fac7b41ea6e590ecd2b..7d6e4aaca19172150a6f2e8f4d3f3d4c8ed95aa7 100644 (file)
 ./Mono.Security.Interface/IBufferOffsetSize.cs
 ./Mono.Security.Interface/IMonoTlsEventSink.cs
 ./Mono.Security.Interface/IMonoTlsContext.cs
-./Mono.Security.Interface/MonoSslStream.cs
+./Mono.Security.Interface/IMonoSslStream.cs
 ./Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ./Mono.Security.Interface/MonoTlsProvider.cs
 ./Mono.Security.Interface/MonoTlsProviderFactory.cs
index 9fea89f179b2b968518c648ccddb0b07c808dce3..4c67ff62a13254be3c7d4442fdecc534db51fc09 100644 (file)
@@ -8,7 +8,7 @@
 ./Mono.Security.Interface/IBufferOffsetSize.cs
 ./Mono.Security.Interface/IMonoTlsEventSink.cs
 ./Mono.Security.Interface/IMonoTlsContext.cs
-./Mono.Security.Interface/MonoSslStream.cs
+./Mono.Security.Interface/IMonoSslStream.cs
 ./Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ./Mono.Security.Interface/MonoTlsProvider.cs
 ./Mono.Security.Interface/MonoTlsProviderFactory.cs
index ec41d5d60bdfc569b0ffbbd66f84d4b6b5a6af65..45798be42a0c9eb0dfd605d9dd852778fc8c2b37 100644 (file)
@@ -80,7 +80,7 @@ MonoTouch/MonoPInvokeCallbackAttribute.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs
index ac2021032a38542d228a7e3dd98e4d0b798e4576..83fc05a364035abd1574b885eb25b1a154f528fe 100644 (file)
@@ -86,7 +86,7 @@ System/AndroidPlatform.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs
index de424699ce1317b0f9ce394e67b0a940c5ad6d39..91f1bd51de6cd52e1e3ea11e2df5288747baf07b 100644 (file)
@@ -85,7 +85,7 @@ MonoTouch/MonoPInvokeCallbackAttribute.cs
 ../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs
 ../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs
-../Mono.Security/Mono.Security.Interface/MonoSslStream.cs
+../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs