Author: atsushi
Date: 2007-01-10 22:09:24 -0500 (Wed, 10 Jan 2007)
New Revision: 70829
Added:
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs
Modified:
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/ChangeLog
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs
trunk/olive/class/System.IdentityModel/System.IdentityModel_test.dll.sources
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/ChangeLog
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs
Log:
2007-01-11 Atsushi Enomoto <[EMAIL PROTECTED]>
* X509IssuerSerialKeyIdentifierClause.cs,
X509ThumbprintKeyIdentifierClause.cs : clause type is null.
* X509IssuerSerialKeyIdentifierClauseTest.cs : test ClauseType.
* X509ThumbprintKeyIdentifierClauseTest.cs : new test.
Modified:
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/ChangeLog
===================================================================
---
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/ChangeLog
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/ChangeLog
2007-01-11 03:09:24 UTC (rev 70829)
@@ -1,3 +1,8 @@
+2007-01-11 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * X509IssuerSerialKeyIdentifierClause.cs,
+ X509ThumbprintKeyIdentifierClause.cs : clause type is null.
+
2006-12-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* X509IssuerSerialKeyIdentifierClause.cs : IssuerSerialNumber is a
Modified:
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs
===================================================================
---
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs
2007-01-11 03:09:24 UTC (rev 70829)
@@ -53,7 +53,7 @@
}
public X509IssuerSerialKeyIdentifierClause (X509Certificate2
certificate)
- : this (certificate.IssuerName.Name, ToDecimalString
(certificate.SerialNumber))
+ : this (null, ToDecimalString
(certificate.SerialNumber))
{
}
Modified:
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs
===================================================================
---
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs
2007-01-11 03:09:24 UTC (rev 70829)
@@ -35,13 +35,13 @@
public class X509ThumbprintKeyIdentifierClause :
BinaryKeyIdentifierClause
{
public X509ThumbprintKeyIdentifierClause (byte []
certificateThumbprint)
- : base (ClaimTypes.Thumbprint, certificateThumbprint,
true)
+ : base (null, certificateThumbprint, true)
{
thumbprint = Convert.ToBase64String
(certificateThumbprint);
}
public X509ThumbprintKeyIdentifierClause (X509Certificate2
certificate)
- : base (ClaimTypes.Thumbprint, certificate.GetCertHash
(), true)
+ : base (null, certificate.GetCertHash (), true)
{
thumbprint = certificate.Thumbprint;
}
Modified:
trunk/olive/class/System.IdentityModel/System.IdentityModel_test.dll.sources
===================================================================
---
trunk/olive/class/System.IdentityModel/System.IdentityModel_test.dll.sources
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/System.IdentityModel_test.dll.sources
2007-01-11 03:09:24 UTC (rev 70829)
@@ -32,3 +32,4 @@
System.IdentityModel.Tokens/X509AsymmetricSecurityKeyTest.cs
System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs
System.IdentityModel.Tokens/X509SecurityTokenTest.cs
+System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs
Modified:
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/ChangeLog
===================================================================
---
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/ChangeLog
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/ChangeLog
2007-01-11 03:09:24 UTC (rev 70829)
@@ -1,3 +1,8 @@
+2007-01-11 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * X509IssuerSerialKeyIdentifierClauseTest.cs : test ClauseType.
+ * X509ThumbprintKeyIdentifierClauseTest.cs : new test.
+
2006-12-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* X509IssuerSerialKeyIdentifierClauseTest.cs : new test.
Modified:
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs
===================================================================
---
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClauseTest.cs
2007-01-11 03:09:24 UTC (rev 70829)
@@ -26,6 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
+using System.IdentityModel.Claims;
using System.IdentityModel.Selectors;
using System.IdentityModel.Tokens;
using System.Security.Cryptography.X509Certificates;
@@ -47,6 +48,7 @@
new X509IssuerSerialKeyIdentifierClause (cert);
Assert.AreEqual ("CN=Mono Test Root Agency",
ic.IssuerName, "#1");
Assert.AreEqual
("22491767666218099257720700881460366085", ic.IssuerSerialNumber, "#2");
+ Assert.AreEqual (null, ic.ClauseType, "#3");
}
}
}
Added:
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs
===================================================================
---
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs
2007-01-11 02:21:16 UTC (rev 70828)
+++
trunk/olive/class/System.IdentityModel/Test/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClauseTest.cs
2007-01-11 03:09:24 UTC (rev 70829)
@@ -0,0 +1,57 @@
+//
+// X509ThumbprintKeyIdentifierClauseTest.cs
+//
+// Author:
+// Atsushi Enomoto <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2006 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 System;
+using System.IdentityModel.Claims;
+using System.IdentityModel.Selectors;
+using System.IdentityModel.Tokens;
+using System.Security.Cryptography.X509Certificates;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.IdentityModel.Selectors
+{
+ [TestFixture]
+ public class X509ThumbprintKeyIdentifierClauseTest
+ {
+ static readonly X509Certificate2 cert = new X509Certificate2
("Test/Resources/test.pfx", "mono");
+ static readonly X509Certificate2 cert2 = new X509Certificate2
("Test/Resources/test2.pfx", "mono");
+
+ [Test]
+ public void Properties ()
+ {
+ X509ThumbprintKeyIdentifierClause ic =
+ new X509ThumbprintKeyIdentifierClause (cert);
+ Assert.AreEqual (cert.GetCertHash (),
ic.GetX509Thumbprint (), "#1-1");
+ Assert.AreEqual (null, ic.ClauseType, "#1-2");
+
+ ic = new X509SecurityToken
(cert).CreateKeyIdentifierClause<X509ThumbprintKeyIdentifierClause> ();
+ Assert.AreEqual (cert.GetCertHash (),
ic.GetX509Thumbprint (), "#2-1");
+ Assert.AreEqual (null, ic.ClauseType, "#2-2");
+ }
+ }
+}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
