Merge pull request #1695 from gregoryyoung/master

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

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs
old mode 100755 (executable)
new mode 100644 (file)
index a5bd5dd..2f53b3f
--- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell Inc. (http://www.novell.com)
+// Copyright (C) 2004-2005 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
@@ -27,9 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if SECURITY_DEP
 
-using System;
 using System.Collections;
 
 namespace System.Security.Cryptography.Pkcs {
@@ -51,7 +50,7 @@ namespace System.Security.Cryptography.Pkcs {
                }
 
                public bool IsSynchronized {
-                       get { return _list.IsSynchronized; }
+                       get { return false; }   // as documented
                }
 
                public SignerInfo this [int index] {
@@ -71,12 +70,22 @@ namespace System.Security.Cryptography.Pkcs {
 
                public void CopyTo (Array array, int index) 
                {
+                       if (array == null)
+                               throw new ArgumentNullException ("array");
+                       if ((index < 0) || (index >= array.Length))
+                               throw new ArgumentOutOfRangeException ("index");
+
                        _list.CopyTo (array, index);
                }
 
-               [MonoTODO]
                public void CopyTo (SignerInfo[] array, int index)
                {
+                       if (array == null)
+                               throw new ArgumentNullException ("array");
+                       if ((index < 0) || (index >= array.Length))
+                               throw new ArgumentOutOfRangeException ("index");
+
+                       _list.CopyTo (array, index);
                }
 
                public SignerInfoEnumerator GetEnumerator ()