Merge pull request #1612 from esdrubal/socketsh

[mono.git] / mcs / class / System.Security / System.Security.Cryptography.Pkcs / SubjectIdentifierOrKey.cs

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs
old mode 100755 (executable)
new mode 100644 (file)
index 1488cb2..97476d2
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs
@@ -2,11 +2,10 @@
 // SubjectIdentifierOrKey.cs - System.Security.Cryptography.Pkcs.SubjectIdentifierOrKey
 //
 // Author:
-//     Sebastien Pouliot (spouliot@motus.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-//
-
+// Copyright (C) 2004 Novell Inc. (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,13 +27,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 
 namespace System.Security.Cryptography.Pkcs {
 
-       public class SubjectIdentifierOrKey {
+       public sealed class SubjectIdentifierOrKey {
 
                private SubjectIdentifierOrKeyType _type;
                private object _value;
@@ -57,4 +55,3 @@ namespace System.Security.Cryptography.Pkcs {
        }
 }
 
-#endif