Merge pull request #2171 from lambdageek/dev/fix-marshal

[mono.git] / mcs / class / System / System.Net / SecurityProtocolType.cs

diff --git a/mcs/class/System/System.Net/SecurityProtocolType.cs b/mcs/class/System/System.Net/SecurityProtocolType.cs
index 981bca25b762613a2867d1c83f36ab08ed3fc1f7..69f2fca0a84d586c6fb220a8b012341d8215e9ac 100644 (file)
--- a/mcs/class/System/System.Net/SecurityProtocolType.cs
+++ b/mcs/class/System/System.Net/SecurityProtocolType.cs
@@ -1,20 +1,40 @@
 //
 // System.Net.SecurityProtocolType.cs
 //
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+// Authors
+//     Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 
-#if NET_1_1
+//
+// 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.
+//
+
+namespace System.Net {
 
-namespace System.Net 
-{
        [Flags]
-       public enum SecurityProtocolType
-       {
+       public
+       enum SecurityProtocolType {
                Ssl3 = 48,
-               Tls = 192
+               Tls = 192,
+               Tls11 = 768,
+               Tls12 = 3072
        }
 }
-
-#endif
\ No newline at end of file