CoreFX import for AlgorithmIdentifier type (#9500)

* bump CoreFX

* CoreFX import for AlgorithmIdentifier type

* Update CoreFX submodule

* [csproj] Update project files

external/corefx

@@ -1 +1 @@
-Subproject commit ae6162f4ec2b3472fafe81c1f655e0a1486967d4
+Subproject commit defc954fff243bdda4e901594eb14b985c8e0d59

mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs

@@ -1,80 +0,0 @@
-//
-// AlgorithmIdentifier.cs - System.Security.Cryptography.Pkcs.AlgorithmIdentifier
-//
-// Author:
-//	Sebastien Pouliot  <[email protected]>
-//
-// (C) 2003 Motus Technologies Inc. (http://www.motus.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
-// "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.
-//
-
-#if SECURITY_DEP
-
-namespace System.Security.Cryptography.Pkcs {
-
-	public sealed class AlgorithmIdentifier {
-
-		private Oid _oid;
-		private int _length;
-		private byte[] _params;
-
-		// constructors
-
-		public AlgorithmIdentifier ()
-		{
-			_oid = new Oid ("1.2.840.113549.3.7", "3des");
-			_params = new byte [0];
-		}
-
-		public AlgorithmIdentifier (Oid oid)
-		{
-			_oid = oid;
-			_params = new byte [0];
-		}
-
-		public AlgorithmIdentifier (Oid oid, int keyLength)
-		{
-			_oid = oid;
-			_length = keyLength;
-			_params = new byte [0];
-		}
-
-		// properties
-
-		public int KeyLength { 
-			get { return _length; }
-			set { _length = value; }
-		}
-
-		public Oid Oid {
-			get { return _oid; }
-			set { _oid = value; }
-		} 
-
-		public byte[] Parameters { 
-			get { return _params; }
-			set { _params = value; }
-		} 
-	}
-}
-
-#endif

mcs/class/System.Security/System.Security.csproj

@@ -131,6 +131,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\CryptographicAttributeObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\CryptographicAttributeObjectCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\CryptographicAttributeObjectEnumerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\AlgorithmIdentifier.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\Asn1\AlgorithmIdentifierAsn.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\Asn1\AttributeAsn.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\Asn1\CertificateChoiceAsn.cs" />
@@ -201,7 +202,6 @@
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="System.Security.Cryptography.Pkcs\AlgorithmIdentifier.cs" />
     <Compile Include="System.Security.Cryptography.Pkcs\EnvelopedCms.cs" />
     <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9SigningTime.cs" />
     <Compile Include="corefx\SR.cs" />

mcs/class/System.Security/System.Security_test.dll.sources

@@ -4,7 +4,6 @@ System.Security.Cryptography/CryptographicAttributeObjectEnumeratorTest.cs
 System.Security.Cryptography/CryptographicAttributeTest.cs
 System.Security.Cryptography/ProtectedDataTest.cs
 System.Security.Cryptography/ProtectedMemoryTest.cs
-System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs
 System.Security.Cryptography.Pkcs/CmsRecipientCollectionTest.cs
 System.Security.Cryptography.Pkcs/CmsRecipientTest.cs
 System.Security.Cryptography.Pkcs/CmsSignerTest.cs

mcs/class/System.Security/System.Security_xtest.dll.sources

@@ -1,3 +1,4 @@
+../../../external/corefx/src/System.Security.Cryptography.Pkcs/tests/AlgorithmIdentifierTest.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/tests/CryptographicAttributeObjectCollectionTests.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/tests/CmsRecipientCollectionTests.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/CertificateTests.cs

mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs

@@ -1,140 +0,0 @@
-//
-// AlgorithmIdentifierTest.cs - NUnit tests for AlgorithmIdentifier
-//
-// Author:
-//	Sebastien Pouliot  <[email protected]>
-//
-// (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
-// "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 NUnit.Framework;
-
-using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Pkcs;
-
-namespace MonoTests.System.Security.Cryptography.Pkcs {
-
-	[TestFixture]
-	public class AlgorithmIdentifierTest {
-
-		static string defaultOid = "1.2.840.113549.3.7";
-		static string defaultName = "3des";
-		static string validOid = "1.2.840.113549.1.1.1";
-
-		[Test]
-		public void ConstructorEmpty () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier ();
-			Assert.AreEqual (0, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (defaultName, ai.Oid.FriendlyName, "Oid.FriendlyName");
-			Assert.AreEqual (defaultOid, ai.Oid.Value, "Oid.Value");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		public void ConstructorOid () 
-		{
-			Oid o = new Oid (validOid);
-			AlgorithmIdentifier ai = new AlgorithmIdentifier (o);
-			Assert.AreEqual (0, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (validOid, ai.Oid.Value, "Oid");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		//BUG [ExpectedException (typeof (ArgumentNullException))]
-		public void ConstructorOidNull () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier (null);
-			Assert.IsNull (ai.Oid, "Oid");
-			Assert.AreEqual (0, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		public void ConstructorOidKeyLength ()
-		{
-			Oid o = new Oid (validOid);
-			AlgorithmIdentifier ai = new AlgorithmIdentifier (o, 128);
-			Assert.AreEqual (128, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (validOid, ai.Oid.Value, "Oid");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		//BUG [ExpectedException (typeof (ArgumentNullException))]
-		public void ConstructorOidNullKeyLength () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier (null, 128);
-			Assert.IsNull (ai.Oid, "Oid");
-			Assert.AreEqual (128, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		//BUG [ExpectedException (typeof (ArgumentOutOfRangeException))]
-		public void ConstructorOidKeyLengthNegative () 
-		{
-			Oid o = new Oid (validOid);
-			AlgorithmIdentifier ai = new AlgorithmIdentifier (o, -1);
-			Assert.AreEqual (-1, ai.KeyLength, "KeyLength");
-			Assert.AreEqual (validOid, ai.Oid.Value, "Oid");
-			Assert.AreEqual (0, ai.Parameters.Length, "Parameters");
-		}
-
-		[Test]
-		public void KeyLength () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier ();
-			ai.KeyLength = Int32.MaxValue;
-			Assert.AreEqual (Int32.MaxValue, ai.KeyLength, "KeyLength-Max");
-			ai.KeyLength = 0;
-			Assert.AreEqual (0, ai.KeyLength, "KeyLength-Zero");
-			ai.KeyLength = Int32.MinValue;
-			Assert.AreEqual (Int32.MinValue, ai.KeyLength, "KeyLength-Min");
-		}
-
-		[Test]
-		public void Oid () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier ();
-			ai.Oid = new Oid (validOid);
-			Assert.AreEqual (validOid, ai.Oid.Value, "Oid");
-			ai.Oid = null;
-			Assert.IsNull (ai.Oid, "Oid-Null");
-		}
-
-		[Test]
-		public void Parameters () 
-		{
-			AlgorithmIdentifier ai = new AlgorithmIdentifier ();
-			ai.Parameters = new byte[2] { 0x05, 0x00 }; // ASN.1 NULL
-			Assert.AreEqual ("05-00", BitConverter.ToString (ai.Parameters), "Parameters");
-			ai.Parameters = null;
-			Assert.IsNull (ai.Parameters, "Parameters-Null");
-		}
-	}
-}
-

mcs/class/System.Security/common_System.Security.dll.sources

@@ -37,7 +37,7 @@ System.Security.Cryptography/ProtectedData.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/SignerInfoAsn.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/SigningCertificateAsn.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/X509ExtensionAsn.cs
-System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs
+../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/AlgorithmIdentifier.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipient.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientCollection.cs
 ../../../external/corefx/src/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipientEnumerator.cs