Author: spouliot
Date: 2005-03-24 14:13:41 -0500 (Thu, 24 Mar 2005)
New Revision: 42231

Added:
   
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateCas.cs
Modified:
   
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/ChangeLog
   
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
   
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509SpcTest.cs
Log:
2005-03-24  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * X509CapiTest.cs: Enabled IntPtr test under Linux. Add IntPtr.Zero 
        tests (special case).
        * X509CertificateCas.cs: New. CAS unit tests for X509Certificate.
        * X509SpcTest.cs: Activate some tests (most only on Windows);



Modified: 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/ChangeLog
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/ChangeLog
 2005-03-24 19:10:59 UTC (rev 42230)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/ChangeLog
 2005-03-24 19:13:41 UTC (rev 42231)
@@ -1,3 +1,10 @@
+2005-03-24  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * X509CapiTest.cs: Enabled IntPtr test under Linux. Add IntPtr.Zero 
+       tests (special case).
+       * X509CertificateCas.cs: New. CAS unit tests for X509Certificate.
+       * X509SpcTest.cs: Activate some tests (most only on Windows);
+
 2005-02-24  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * X509Cert20Test.cs: Fx 2.0 specific certificate tests.

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
   2005-03-24 19:10:59 UTC (rev 42230)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CapiTest.cs
   2005-03-24 19:13:41 UTC (rev 42231)
@@ -2,9 +2,10 @@
 // X509CAPI.cs - NUnit Test Cases for X509 CAPI integration (IntPtr 
constructor)
 //
 // Author:
-//     Sebastien Pouliot ([EMAIL PROTECTED])
+//     Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
 
 using NUnit.Framework;
@@ -102,47 +103,55 @@
                }
 
                [Test]
-               public void ConstructorIntPtr()
+               public void ConstructorIntPtr ()
                {
+                       byte[] cert = { 
0x30,0x82,0x01,0xFF,0x30,0x82,0x01,0x6C,0x02,0x05,0x02,0x72,0x00,0x06,0xE8,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x30,0x5F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x13,0x17,0x52,0x53,0x41,0x20,0x44,0x61,0x74,0x61,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x2E,0x30,0x2C,0x06,0x03,0x55,0x04,0x0B,0x13,0x25,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x53,0x65,0x72,0x76,
+                               
0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,0x0D,0x39,0x36,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x37,0x5A,0x17,0x0D,0x39,0x37,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x36,0x5A,0x30,0x61,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0A,0x43,0x61,0x6C,0x69,0x66,0x6F,0x72,0x6E,0x69,0x61,0x31,0x14,0x30,0x12,0x06,0x03,
+                               
0x55,0x04,0x0A,0x13,0x0B,0x43,0x6F,0x6D,0x6D,0x65,0x72,0x63,0x65,0x4E,0x65,0x74,0x31,0x27,0x30,0x25,0x06,0x03,0x55,0x04,0x0B,0x13,0x1E,0x53,0x65,0x72,0x76,0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x70,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x5F,0x00,0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,
+                               
0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x03,0x7E,0x00,0x54,0x20,0x67,0x12,0xBB,0x66,0x14,0xC3,0x26,0x6B,0x7F,
+                               
0xDA,0x4A,0x25,0x4D,0x8B,0xE0,0xFD,0x1E,0x53,0x6D,0xAC,0xA2,0xD0,0x89,0xB8,0x2E,0x90,0xA0,0x27,0x43,0xA4,0xEE,0x4A,0x26,0x86,0x40,0xFF,0xB8,0x72,0x8D,0x1E,0xE7,0xB7,0x77,0xDC,0x7D,0xD8,0x3F,0x3A,0x6E,0x55,0x10,0xA6,0x1D,0xB5,0x58,0xF2,0xF9,0x0F,0x2E,0xB4,0x10,0x55,0x48,0xDC,0x13,0x5F,0x0D,0x08,0x26,0x88,0xC9,0xAF,0x66,0xF2,0x2C,0x9C,0x6F,0x3D,0xC3,0x2B,0x69,0x28,0x89,0x40,0x6F,0x8F,0x35,0x3B,0x9E,0xF6,0x8E,0xF1,0x11,0x17,0xFB,0x0C,0x98,0x95,0xA1,0xC2,0xBA,0x89,0x48,0xEB,0xB4,0x06,0x6A,0x22,0x54,
+                               
0xD7,0xBA,0x18,0x3A,0x48,0xA6,0xCB,0xC2,0xFD,0x20,0x57,0xBC,0x63,0x1C };
+
                        // will only work on Windows (MS or Mono)
                        // this isn't much of a problem because the structure 
CERT_CONTEXT (IntPtr)
                        // is specific to CryptoAPI/Windows.
+                       IntPtr handle = IntPtr.Zero;
+
                        if (Path.DirectorySeparatorChar == '\\') {
-                               byte[] cert = { 
0x30,0x82,0x01,0xFF,0x30,0x82,0x01,0x6C,0x02,0x05,0x02,0x72,0x00,0x06,0xE8,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x30,0x5F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x13,0x17,0x52,0x53,0x41,0x20,0x44,0x61,0x74,0x61,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x2E,0x30,0x2C,0x06,0x03,0x55,0x04,0x0B,0x13,0x25,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x53,0x65,0x72,0x76,
-                                       
0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,0x0D,0x39,0x36,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x37,0x5A,0x17,0x0D,0x39,0x37,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x36,0x5A,0x30,0x61,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0A,0x43,0x61,0x6C,0x69,0x66,0x6F,0x72,0x6E,0x69,0x61,0x31,0x14,0x30,0x12,0x06,0x03,
-                                       
0x55,0x04,0x0A,0x13,0x0B,0x43,0x6F,0x6D,0x6D,0x65,0x72,0x63,0x65,0x4E,0x65,0x74,0x31,0x27,0x30,0x25,0x06,0x03,0x55,0x04,0x0B,0x13,0x1E,0x53,0x65,0x72,0x76,0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x70,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x5F,0x00,0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,
-                                       
0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x03,0x7E,0x00,0x54,0x20,0x67,0x12,0xBB,0x66,0x14,0xC3,0x26,0x6B,0x7F,
-                                       
0xDA,0x4A,0x25,0x4D,0x8B,0xE0,0xFD,0x1E,0x53,0x6D,0xAC,0xA2,0xD0,0x89,0xB8,0x2E,0x90,0xA0,0x27,0x43,0xA4,0xEE,0x4A,0x26,0x86,0x40,0xFF,0xB8,0x72,0x8D,0x1E,0xE7,0xB7,0x77,0xDC,0x7D,0xD8,0x3F,0x3A,0x6E,0x55,0x10,0xA6,0x1D,0xB5,0x58,0xF2,0xF9,0x0F,0x2E,0xB4,0x10,0x55,0x48,0xDC,0x13,0x5F,0x0D,0x08,0x26,0x88,0xC9,0xAF,0x66,0xF2,0x2C,0x9C,0x6F,0x3D,0xC3,0x2B,0x69,0x28,0x89,0x40,0x6F,0x8F,0x35,0x3B,0x9E,0xF6,0x8E,0xF1,0x11,0x17,0xFB,0x0C,0x98,0x95,0xA1,0xC2,0xBA,0x89,0x48,0xEB,0xB4,0x06,0x6A,0x22,0x54,
-                                       
0xD7,0xBA,0x18,0x3A,0x48,0xA6,0xCB,0xC2,0xFD,0x20,0x57,0xBC,0x63,0x1C };
+                               handle = GetHandle (cert);
+                       } else {
+                               handle = GetHandleEx (cert);
+                       }
 
-                               IntPtr handle = GetHandle (cert);
-                               X509Certificate x509 = new X509Certificate 
(handle);
+                       X509Certificate x509 = new X509Certificate (handle);
+                       byte[] hash = { 
0xD6,0x2F,0x48,0xD0,0x13,0xEE,0x7F,0xB5,0x8B,0x79,0x07,0x45,0x12,0x67,0x0D,0x9C,0x5B,0x3A,0x5D,0xA9
 };
+                       AssertEquals ("GetCertHash", hash, x509.GetCertHash ());
+                       Assertion.AssertEquals ("GetCertHashString", 
"D62F48D013EE7FB58B79074512670D9C5B3A5DA9", x509.GetCertHashString ());
+                       Assertion.AssertEquals ("GetEffectiveDateString", 
"03/12/1996 10:38:47", x509.GetEffectiveDateString ());
+                       Assertion.AssertEquals ("GetExpirationDateString", 
"03/12/1997 10:38:46", x509.GetExpirationDateString ());
+                       Assertion.AssertEquals ("GetFormat", "X509", 
x509.GetFormat ());
+                       Assertion.AssertEquals ("GetHashCode", -701544240, 
x509.GetHashCode ());
+                       Assertion.AssertEquals ("GetIssuerName", "C=US, O=\"RSA 
Data Security, Inc.\", OU=Secure Server Certification Authority", 
x509.GetIssuerName ());
+                       Assertion.AssertEquals ("GetKeyAlgorithm", 
"1.2.840.113549.1.1.1", x509.GetKeyAlgorithm ());
+                       byte[] keyparams = { 0x05,0x00 };
+                       AssertEquals ("GetKeyAlgorithmParameters", keyparams, 
x509.GetKeyAlgorithmParameters ());
+                       Assertion.AssertEquals 
("GetKeyAlgorithmParametersString", "0500", 
x509.GetKeyAlgorithmParametersString ());
+                       Assertion.AssertEquals ("GetName", "C=US, S=California, 
O=CommerceNet, OU=Server Certification Authority", x509.GetName ());
+                       byte[] pubkey = { 
0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01
 };
+                       AssertEquals ("GetPublicKey", pubkey, x509.GetPublicKey 
());
+                       Assertion.AssertEquals ("GetPublicKeyString", 
"305C02552D58E9BFF031CD7906505AD59E0E2CE6C2F7F9D2CE556485B1909A92B336C1BCEAC823B7AB3AA76463775F84228EE5B645DD46AE0ADD00C21FBAD9ADC07562F89582A280B18269FAE1AF7FBC7DE27C76D5BC2A80FB0203010001",
 x509.GetPublicKeyString ());
+                       AssertEquals ("GetRawCertData", cert, 
x509.GetRawCertData ());
+                       Assertion.AssertEquals ("GetRawCertDataString", 
ToString (cert), x509.GetRawCertDataString ());
+                       byte[] serial = { 0xE8,0x06,0x00,0x72,0x02 };
+                       AssertEquals ("GetSerialNumber", serial, 
x509.GetSerialNumber ());
+                       Assertion.AssertEquals ("GetSerialNumberString", 
"E806007202", x509.GetSerialNumberString ());
+               }
 
-                               byte[] hash = { 
0xD6,0x2F,0x48,0xD0,0x13,0xEE,0x7F,0xB5,0x8B,0x79,0x07,0x45,0x12,0x67,0x0D,0x9C,0x5B,0x3A,0x5D,0xA9
 };
-                               AssertEquals ("GetCertHash", hash, 
x509.GetCertHash ());
-                               Assertion.AssertEquals ("GetCertHashString", 
"D62F48D013EE7FB58B79074512670D9C5B3A5DA9", x509.GetCertHashString ());
-                               Assertion.AssertEquals 
("GetEffectiveDateString", "03/12/1996 10:38:47", x509.GetEffectiveDateString 
());
-                               Assertion.AssertEquals 
("GetExpirationDateString", "03/12/1997 10:38:46", x509.GetExpirationDateString 
());
-                               Assertion.AssertEquals ("GetFormat", "X509", 
x509.GetFormat ());
-                               Assertion.AssertEquals ("GetHashCode", 
-701544240, x509.GetHashCode ());
-                               Assertion.AssertEquals ("GetIssuerName", "C=US, 
O=\"RSA Data Security, Inc.\", OU=Secure Server Certification Authority", 
x509.GetIssuerName ());
-                               Assertion.AssertEquals ("GetKeyAlgorithm", 
"1.2.840.113549.1.1.1", x509.GetKeyAlgorithm ());
-                               byte[] keyparams = { 0x05,0x00 };
-                               AssertEquals ("GetKeyAlgorithmParameters", 
keyparams, x509.GetKeyAlgorithmParameters ());
-                               Assertion.AssertEquals 
("GetKeyAlgorithmParametersString", "0500", 
x509.GetKeyAlgorithmParametersString ());
-                               Assertion.AssertEquals ("GetName", "C=US, 
S=California, O=CommerceNet, OU=Server Certification Authority", x509.GetName 
());
-                               byte[] pubkey = { 
0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01
 };
-                               AssertEquals ("GetPublicKey", pubkey, 
x509.GetPublicKey ());
-                               Assertion.AssertEquals ("GetPublicKeyString", 
"305C02552D58E9BFF031CD7906505AD59E0E2CE6C2F7F9D2CE556485B1909A92B336C1BCEAC823B7AB3AA76463775F84228EE5B645DD46AE0ADD00C21FBAD9ADC07562F89582A280B18269FAE1AF7FBC7DE27C76D5BC2A80FB0203010001",
 x509.GetPublicKeyString ());
-                               AssertEquals ("GetRawCertData", cert, 
x509.GetRawCertData ());
-                               Assertion.AssertEquals ("GetRawCertDataString", 
ToString (cert), x509.GetRawCertDataString ());
-                               byte[] serial = { 0xE8,0x06,0x00,0x72,0x02 };
-                               AssertEquals ("GetSerialNumber", serial, 
x509.GetSerialNumber ());
-                               Assertion.AssertEquals 
("GetSerialNumberString", "E806007202", x509.GetSerialNumberString ());
-                       } 
-                       else {
-                               Console.WriteLine ("Will not work on Linux"); 
-                       }
+               [Test]
+               public void ConstructorIntPtrZero ()
+               {
+                       X509Certificate spc = new X509Certificate (IntPtr.Zero);
+                       Assert.AreEqual (0, spc.GetHashCode (), 
"ConstructorIntPtrZero");
                }
        }
 }

Added: 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateCas.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateCas.cs
     2005-03-24 19:10:59 UTC (rev 42230)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509CertificateCas.cs
     2005-03-24 19:13:41 UTC (rev 42231)
@@ -0,0 +1,198 @@
+//
+// X509CertificateCas.cs - CAS unit tests for 
+//     System.Security.Cryptography.X509Certificates.X509CertificateCas
+//
+// Author:
+//     Sebastien Pouliot  <[EMAIL PROTECTED]>
+//
+// Copyright (C) 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.
+//
+
+using NUnit.Framework;
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Permissions;
+using System.Threading;
+
+namespace MonoCasTests.System.Security.Cryptography.X509Certificates {
+
+       [TestFixture]
+       [Category ("CAS")]
+       public class X509CertificateCas {
+
+               private static readonly byte[] cert = { 
0x30,0x82,0x01,0xFF,0x30,0x82,0x01,0x6C,0x02,0x05,0x02,0x72,0x00,0x06,0xE8,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x30,0x5F,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x13,0x17,0x52,0x53,0x41,0x20,0x44,0x61,0x74,0x61,0x20,0x53,0x65,0x63,0x75,0x72,0x69,0x74,0x79,0x2C,0x20,0x49,0x6E,0x63,0x2E,0x31,0x2E,0x30,0x2C,0x06,0x03,0x55,0x04,0x0B,0x13,0x25,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x53,0x65,0x72,0x76,
+                       
0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,0x0D,0x39,0x36,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x37,0x5A,0x17,0x0D,0x39,0x37,0x30,0x33,0x31,0x32,0x31,0x38,0x33,0x38,0x34,0x36,0x5A,0x30,0x61,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0A,0x43,0x61,0x6C,0x69,0x66,0x6F,0x72,0x6E,0x69,0x61,0x31,0x14,0x30,0x12,0x06,0x03,
+                       
0x55,0x04,0x0A,0x13,0x0B,0x43,0x6F,0x6D,0x6D,0x65,0x72,0x63,0x65,0x4E,0x65,0x74,0x31,0x27,0x30,0x25,0x06,0x03,0x55,0x04,0x0B,0x13,0x1E,0x53,0x65,0x72,0x76,0x65,0x72,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x70,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x5F,0x00,0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,
+                       
0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,0x05,0x00,0x03,0x7E,0x00,0x54,0x20,0x67,0x12,0xBB,0x66,0x14,0xC3,0x26,0x6B,0x7F,
+                       
0xDA,0x4A,0x25,0x4D,0x8B,0xE0,0xFD,0x1E,0x53,0x6D,0xAC,0xA2,0xD0,0x89,0xB8,0x2E,0x90,0xA0,0x27,0x43,0xA4,0xEE,0x4A,0x26,0x86,0x40,0xFF,0xB8,0x72,0x8D,0x1E,0xE7,0xB7,0x77,0xDC,0x7D,0xD8,0x3F,0x3A,0x6E,0x55,0x10,0xA6,0x1D,0xB5,0x58,0xF2,0xF9,0x0F,0x2E,0xB4,0x10,0x55,0x48,0xDC,0x13,0x5F,0x0D,0x08,0x26,0x88,0xC9,0xAF,0x66,0xF2,0x2C,0x9C,0x6F,0x3D,0xC3,0x2B,0x69,0x28,0x89,0x40,0x6F,0x8F,0x35,0x3B,0x9E,0xF6,0x8E,0xF1,0x11,0x17,0xFB,0x0C,0x98,0x95,0xA1,0xC2,0xBA,0x89,0x48,0xEB,0xB4,0x06,0x6A,0x22,0x54,
+                       
0xD7,0xBA,0x18,0x3A,0x48,0xA6,0xCB,0xC2,0xFD,0x20,0x57,0xBC,0x63,0x1C };
+
+               private CultureInfo oldcult;
+               private string temppath;
+               private string certfile;
+               private string signedfile;
+
+               private void WriteFile (string filename, byte[] data)
+               {
+                       using (FileStream fs = File.OpenWrite (filename)) {
+                               fs.Write (data, 0, data.Length);
+                               fs.Close ();
+                       }
+               }
+
+               [TestFixtureSetUp]
+               public void FixtureSetUp ()
+               {
+                       // the current culture determines the result of 
formatting
+                       oldcult = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo 
("");
+
+                       temppath = Path.GetTempPath ();
+                       certfile = Path.Combine (temppath, "temp.cer");
+                       signedfile = Path.Combine (temppath, "temp.exe");
+
+                       WriteFile (certfile, cert);
+                       WriteFile (signedfile, 
MonoTests.System.Security.Cryptography.X509Certificates.SoftwarePublisherCertificateTest.smallspcexe);
+               }
+
+               [SetUp]
+               public void SetUp ()
+               {
+                       if (!SecurityManager.SecurityEnabled)
+                               Assert.Ignore ("SecurityManager.SecurityEnabled 
is OFF");
+               }
+
+               [TearDown]
+               public void TearDown () 
+               {
+                       Thread.CurrentThread.CurrentCulture = oldcult;
+               }
+
+               [TestFixtureTearDown]
+               public void FixtureTearDown ()
+               {
+                       Thread.CurrentThread.CurrentCulture = oldcult;
+
+                       if (File.Exists (certfile))
+                               File.Delete (certfile);
+                       if (File.Exists (signedfile))
+                               File.Delete (signedfile);
+               }
+
+               // Partial Trust Tests - i.e. call "normal" unit with reduced 
privileges
+
+               [Test]
+               [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
+               public void PartialTrust_DenyUnrestricted ()
+               {
+                       X509Certificate x509 = new X509Certificate (cert);
+                       X509Certificate clone = new X509Certificate (x509);
+
+                       Assert.IsTrue (x509.Equals (clone), "Equals 1");
+                       Assert.IsTrue (clone.Equals (x509), "Equals 2");
+
+                       byte[] hash = { 
0xD6,0x2F,0x48,0xD0,0x13,0xEE,0x7F,0xB5,0x8B,0x79,0x07,0x45,0x12,0x67,0x0D,0x9C,0x5B,0x3A,0x5D,0xA9
 };
+                       Assert.AreEqual (hash, x509.GetCertHash (), 
"GetCertHash");
+                       Assert.AreEqual 
("D62F48D013EE7FB58B79074512670D9C5B3A5DA9", x509.GetCertHashString (), 
"GetCertHashString");
+                       Assert.AreEqual ("03/12/1996 10:38:47", 
x509.GetEffectiveDateString (), "GetEffectiveDateString");
+                       Assert.AreEqual ("03/12/1997 10:38:46", 
x509.GetExpirationDateString (), "GetExpirationDateString");
+                       Assert.AreEqual ("X509", x509.GetFormat (), 
"GetFormat");
+                       Assert.AreEqual (-701544240, x509.GetHashCode (), 
"GetHashCode");
+                       Assert.AreEqual ("C=US, O=\"RSA Data Security, Inc.\", 
OU=Secure Server Certification Authority", x509.GetIssuerName (), 
"GetIssuerName");
+                       Assert.AreEqual ("1.2.840.113549.1.1.1", 
x509.GetKeyAlgorithm (), "GetKeyAlgorithm");
+                       byte[] keyparams = { 0x05,0x00 };
+                       Assert.AreEqual (keyparams, 
x509.GetKeyAlgorithmParameters (), "GetKeyAlgorithmParameters");
+                       Assert.AreEqual ("0500", 
x509.GetKeyAlgorithmParametersString (), "GetKeyAlgorithmParametersString");
+                       Assert.AreEqual ("C=US, S=California, O=CommerceNet, 
OU=Server Certification Authority", x509.GetName (), "GetName");
+                       byte[] pubkey = { 
0x30,0x5C,0x02,0x55,0x2D,0x58,0xE9,0xBF,0xF0,0x31,0xCD,0x79,0x06,0x50,0x5A,0xD5,0x9E,0x0E,0x2C,0xE6,0xC2,0xF7,0xF9,0xD2,0xCE,0x55,0x64,0x85,0xB1,0x90,0x9A,0x92,0xB3,0x36,0xC1,0xBC,0xEA,0xC8,0x23,0xB7,0xAB,0x3A,0xA7,0x64,0x63,0x77,0x5F,0x84,0x22,0x8E,0xE5,0xB6,0x45,0xDD,0x46,0xAE,0x0A,0xDD,0x00,0xC2,0x1F,0xBA,0xD9,0xAD,0xC0,0x75,0x62,0xF8,0x95,0x82,0xA2,0x80,0xB1,0x82,0x69,0xFA,0xE1,0xAF,0x7F,0xBC,0x7D,0xE2,0x7C,0x76,0xD5,0xBC,0x2A,0x80,0xFB,0x02,0x03,0x01,0x00,0x01
 };
+                       Assert.AreEqual (pubkey, x509.GetPublicKey (), 
"GetPublicKey");
+                       Assert.AreEqual 
("305C02552D58E9BFF031CD7906505AD59E0E2CE6C2F7F9D2CE556485B1909A92B336C1BCEAC823B7AB3AA76463775F84228EE5B645DD46AE0ADD00C21FBAD9ADC07562F89582A280B18269FAE1AF7FBC7DE27C76D5BC2A80FB0203010001",
 x509.GetPublicKeyString (), "GetPublicKeyString");
+                       Assert.AreEqual (cert, x509.GetRawCertData (), 
"GetRawCertData");
+                       Assert.IsNotNull (x509.GetRawCertDataString (), 
"GetRawCertDataString");
+                       byte[] serial = { 0xE8,0x06,0x00,0x72,0x02 };
+                       Assert.AreEqual (serial, x509.GetSerialNumber (), 
"GetSerialNumber");
+                       Assert.AreEqual ("E806007202", 
x509.GetSerialNumberString (), "GetSerialNumberString");
+                       Assert.IsNotNull (x509.ToString (true), "ToString");
+               }       
+
+               [Test]
+               [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
+               [ExpectedException (typeof (SecurityException))]
+               public void PartialTrust_DenyUnrestricted_CreateFromCertFile ()
+               {
+                       X509Certificate disk = 
X509Certificate.CreateFromCertFile (certfile);
+               }
+
+               [Test]
+               [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
+               [ExpectedException (typeof (SecurityException))]
+               public void PartialTrust_DenyUnrestricted_CreateFromSignedFile 
()
+               {
+                       X509Certificate spc = 
X509Certificate.CreateFromSignedFile (signedfile);
+               }
+
+               [Test]
+               [FileIOPermission (SecurityAction.PermitOnly, Unrestricted = 
true)]
+               public void PartialTrust_PermitOnlyFileIOPermission ()
+               {
+                       X509Certificate x509 = new X509Certificate (cert);
+                       X509Certificate disk = 
X509Certificate.CreateFromCertFile (certfile);
+                       Assert.IsTrue (disk.Equals (x509), "Equals 1");
+                       Assert.IsTrue (x509.Equals (disk), "Equals 2");
+
+                       try {
+                               X509Certificate spc = 
X509Certificate.CreateFromSignedFile (signedfile);
+                               Assert.IsFalse (spc.Equals (x509), "!Equals 1");
+                               Assert.IsFalse (x509.Equals (spc), "!Equals 2");
+                       }
+                       catch (COMException) {
+                               // most likely the root certificate isn't 
available
+                               // anyway this indicates that the security 
check is ok
+                       }
+               }
+
+               // test demands by denying the required permission
+
+               [Test]
+               [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
+               [ExpectedException (typeof (SecurityException))]
+               public void ConstructorIntPtr_DenyUnmanagedCode ()
+               {
+                       // will fail before calling the constructor
+                       X509Certificate x509 = new X509Certificate 
(IntPtr.Zero);
+               }
+
+               [Test]
+               [SecurityPermission (SecurityAction.PermitOnly, UnmanagedCode = 
true)]
+               public void ConstructorIntPtr_PermitOnlyUnmanagedCode ()
+               {
+                       // will fail _when_ calling the constructor
+                       X509Certificate x509 = new X509Certificate 
(IntPtr.Zero);
+                       Assert.AreEqual (0, x509.GetHashCode (), 
"ConstructorIntPtrZero");
+               }
+       }
+}

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509SpcTest.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509SpcTest.cs
    2005-03-24 19:10:59 UTC (rev 42230)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Cryptography.X509Certificates/X509SpcTest.cs
    2005-03-24 19:13:41 UTC (rev 42231)
@@ -16,7 +16,7 @@
 
 namespace MonoTests.System.Security.Cryptography.X509Certificates {
 
-//     [TestFixture]
+       [TestFixture]
        public class SoftwarePublisherCertificateTest : Assertion {
 
                [TearDown]
@@ -288,7 +288,7 @@
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
0x00, 0x00 };
 
-               static private byte[] smallspcexe = { 
+               static internal byte[] smallspcexe = { 
                0x4D, 0x5A, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 
0x00, 0x00, 
                0xFF, 0xFF, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 
                0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
0x00, 0x00, 
@@ -1000,6 +1000,7 @@
                }
 
                [Test]
+               [Category ("NotWorking")] // we're missing the root certificate
                public void ValidSignature () 
                {
                        string filename = Path.GetFullPath ("smallspc.exe");
@@ -1012,6 +1013,7 @@
 
                [Test]
                [ExpectedException (typeof (COMException))]
+               [Category ("NotWorking")]
                public void InvalidSignature () 
                {
                        string filename = Path.GetFullPath 
("smallspc-invalid.exe");

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to