Author: spouliot
Date: 2005-04-23 10:19:12 -0400 (Sat, 23 Apr 2005)
New Revision: 43482
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ChangeLog
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipient.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs
Log:
2005-04-23 Sebastien Pouliot <[EMAIL PROTECTED]>
* CmsRecipient.cs, CmsRecipientCollection.cs, CmsSigner.cs,
EnvelopedCms.cs, KeyAgreeRecipientInfo.cs, Pkcs9Attribute.cs,
Pkcs9ContentType.cs, Pkcs9DocumentDescription.cs, Pkcs9DocumentName.cs,
Pkcs9MessageDigest.cs, Pkcs9SigningTime.cs, SignedCms.cs,
SignerInfo.cs: Adapted for changes in class names in beta2.
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ChangeLog
===================================================================
--- trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ChangeLog
2005-04-23 14:15:49 UTC (rev 43481)
+++ trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ChangeLog
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,3 +1,11 @@
+2005-04-23 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * CmsRecipient.cs, CmsRecipientCollection.cs, CmsSigner.cs,
+ EnvelopedCms.cs, KeyAgreeRecipientInfo.cs, Pkcs9Attribute.cs,
+ Pkcs9ContentType.cs, Pkcs9DocumentDescription.cs, Pkcs9DocumentName.cs,
+ Pkcs9MessageDigest.cs, Pkcs9SigningTime.cs, SignedCms.cs,
+ SignerInfo.cs: Adapted for changes in class names in beta2.
+
2005-01-17 Sebastien Pouliot <[EMAIL PROTECTED]>
* Pkcs9Attribute.cs: Fixed wrt unit tests.
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipient.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipient.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipient.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// System.Security.Cryptography.Pkcs.CmsRecipient
+// System.Security.Cryptography.Pkcs.CmsRecipient class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Collections;
using System.Security.Cryptography.X509Certificates;
@@ -38,11 +37,11 @@
public sealed class CmsRecipient {
private SubjectIdentifierType _recipient;
- private X509CertificateEx _certificate;
+ private X509Certificate2 _certificate;
// constructor
- public CmsRecipient (X509CertificateEx certificate)
+ public CmsRecipient (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -50,7 +49,7 @@
_certificate = certificate;
}
- public CmsRecipient (SubjectIdentifierType
recipientIdentifierType, X509CertificateEx certificate)
+ public CmsRecipient (SubjectIdentifierType
recipientIdentifierType, X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -64,7 +63,7 @@
// properties
- public X509CertificateEx Certificate {
+ public X509Certificate2 Certificate {
get { return _certificate; }
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsRecipientCollection.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// System.Security.Cryptography.Pkcs.CmsRecipientCollection
+// System.Security.Cryptography.Pkcs.CmsRecipientCollection class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Collections;
using System.Security.Cryptography.X509Certificates;
@@ -51,9 +50,9 @@
_list.Add (recipient);
}
- public CmsRecipientCollection (SubjectIdentifierType
recipientIdentifierType, X509CertificateExCollection certificates) : base ()
+ public CmsRecipientCollection (SubjectIdentifierType
recipientIdentifierType, X509Certificate2Collection certificates) : base ()
{
- foreach (X509CertificateEx x509 in certificates) {
+ foreach (X509Certificate2 x509 in certificates) {
CmsRecipient p7r = new CmsRecipient
(recipientIdentifierType, x509);
_list.Add (p7r);
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CmsSigner.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// System.Security.Cryptography.Pkcs.CmsSigner
+// System.Security.Cryptography.Pkcs.CmsSigner class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Security.Cryptography.X509Certificates;
namespace System.Security.Cryptography.Pkcs {
@@ -37,12 +36,12 @@
public sealed class CmsSigner {
private SubjectIdentifierType _signer;
- private X509CertificateEx _certificate;
- private X509CertificateExCollection _coll;
+ private X509Certificate2 _certificate;
+ private X509Certificate2Collection _coll;
private Oid _digest;
private X509IncludeOption _options;
- private CryptographicAttributeCollection _signed;
- private CryptographicAttributeCollection _unsigned;
+ private CryptographicAttributeObjectCollection _signed;
+ private CryptographicAttributeObjectCollection _unsigned;
// constructors
@@ -51,9 +50,9 @@
_signer = SubjectIdentifierType.IssuerAndSerialNumber;
_digest = new Oid ("1.3.14.3.2.26");
_options = X509IncludeOption.ExcludeRoot;
- _signed = new CryptographicAttributeCollection ();
- _unsigned = new CryptographicAttributeCollection ();
- _coll = new X509CertificateExCollection ();
+ _signed = new CryptographicAttributeObjectCollection ();
+ _unsigned = new CryptographicAttributeObjectCollection
();
+ _coll = new X509Certificate2Collection ();
}
public CmsSigner (SubjectIdentifierType signerIdentifierType) :
this ()
@@ -64,7 +63,7 @@
_signer = signerIdentifierType;
}
- public CmsSigner (SubjectIdentifierType signerIdentifierType,
X509CertificateEx certificate)
+ public CmsSigner (SubjectIdentifierType signerIdentifierType,
X509Certificate2 certificate)
: this (signerIdentifierType)
{
// FIXME: compatibility with fx 1.2.3400.0
@@ -73,7 +72,7 @@
_certificate = certificate;
}
- public CmsSigner (X509CertificateEx certificate) : this ()
+ public CmsSigner (X509Certificate2 certificate) : this ()
{
// FIXME: compatibility with fx 1.2.3400.0
// if (certificate == null)
@@ -88,16 +87,16 @@
// properties
- public CryptographicAttributeCollection SignedAttributes {
+ public CryptographicAttributeObjectCollection SignedAttributes {
get { return _signed; }
}
- public X509CertificateEx Certificate {
+ public X509Certificate2 Certificate {
get { return _certificate; }
set { _certificate = value; }
}
- public X509CertificateExCollection Certificates {
+ public X509Certificate2Collection Certificates {
get { return _coll; }
}
@@ -121,7 +120,7 @@
}
}
- public CryptographicAttributeCollection UnsignedAttributes {
+ public CryptographicAttributeObjectCollection
UnsignedAttributes {
get { return _unsigned; }
}
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// System.Security.Cryptography.Pkcs.EnvelopedCms
+// System.Security.Cryptography.Pkcs.EnvelopedCms class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Collections;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.Xml;
@@ -47,9 +46,9 @@
private ContentInfo _content;
private AlgorithmIdentifier _identifier;
- private X509CertificateExCollection _certs;
+ private X509Certificate2Collection _certs;
private RecipientInfoCollection _recipients;
- private CryptographicAttributeCollection _uattribs;
+ private CryptographicAttributeObjectCollection _uattribs;
private SubjectIdentifierType _idType;
private int _version;
@@ -57,9 +56,9 @@
public EnvelopedCms ()
{
- _certs = new X509CertificateExCollection ();
+ _certs = new X509Certificate2Collection ();
_recipients = new RecipientInfoCollection ();
- _uattribs = new CryptographicAttributeCollection ();
+ _uattribs = new CryptographicAttributeObjectCollection
();
}
public EnvelopedCms (ContentInfo content) : this ()
@@ -70,7 +69,7 @@
_content = content;
}
- public EnvelopedCms (ContentInfo contentInfo,
AlgorithmIdentifier encryptionAlgorithm)
+ public EnvelopedCms (ContentInfo contentInfo,
AlgorithmIdentifier encryptionAlgorithm)
: this (contentInfo)
{
if (encryptionAlgorithm == null)
@@ -95,7 +94,7 @@
// properties
- public X509CertificateExCollection Certificates {
+ public X509Certificate2Collection Certificates {
get { return _certs; }
}
@@ -121,7 +120,7 @@
get { return _recipients; }
}
- public CryptographicAttributeCollection UnprotectedAttributes {
+ public CryptographicAttributeObjectCollection
UnprotectedAttributes {
get { return _uattribs; }
}
@@ -194,7 +193,7 @@
}
[MonoTODO]
- public void Decrypt (RecipientInfo recipientInfo,
X509CertificateExCollection extraStore)
+ public void Decrypt (RecipientInfo recipientInfo,
X509Certificate2Collection extraStore)
{
if (recipientInfo == null)
throw new ArgumentNullException
("recipientInfo");
@@ -204,7 +203,7 @@
}
[MonoTODO]
- public void Decrypt (X509CertificateExCollection extraStore)
+ public void Decrypt (X509Certificate2Collection extraStore)
{
if (extraStore == null)
throw new ArgumentNullException ("extraStore");
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// KeyAgreeRecipientInfo.cs -
System.Security.Cryptography.Pkcs.KeyAgreeRecipientInfo
+// System.Security.Cryptography.Pkcs.KeyAgreeRecipientInfo class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,8 +29,6 @@
#if NET_2_0
-using System;
-
namespace System.Security.Cryptography.Pkcs {
[MonoTODO]
@@ -58,7 +56,7 @@
get { return null; }
}
- public CryptographicAttribute OtherKeyAttribute {
+ public CryptographicAttributeObject OtherKeyAttribute {
get { return null; }
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,5 +1,5 @@
//
-// Pkcs9Attribute.cs - System.Security.Cryptography.Pkcs.Pkcs9Attribute
+// System.Security.Cryptography.Pkcs.Pkcs9AttributeObject class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
@@ -33,21 +33,21 @@
namespace System.Security.Cryptography.Pkcs {
- public class Pkcs9Attribute : AsnEncodedData {
+ public class Pkcs9AttributeObject : AsnEncodedData {
// constructors
- public Pkcs9Attribute ()
+ public Pkcs9AttributeObject ()
: base ()
{
}
- public Pkcs9Attribute (AsnEncodedData asnEncodedData)
+ public Pkcs9AttributeObject (AsnEncodedData asnEncodedData)
: base (asnEncodedData)
{
}
- public Pkcs9Attribute (Oid oid, byte[] encodedData)
+ public Pkcs9AttributeObject (Oid oid, byte[] encodedData)
{
if (oid == null)
throw new ArgumentNullException ("oid");
@@ -55,7 +55,7 @@
RawData = encodedData;
}
- public Pkcs9Attribute (string oid, byte[] encodedData)
+ public Pkcs9AttributeObject (string oid, byte[] encodedData)
: base (oid, encodedData)
{
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9ContentType.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -33,7 +33,7 @@
namespace System.Security.Cryptography.Pkcs {
[MonoTODO ("missing internals")]
- public sealed class Pkcs9ContentType : Pkcs9Attribute {
+ public sealed class Pkcs9ContentType : Pkcs9AttributeObject {
internal const string oid = "1.2.840.113549.1.9.3";
internal const string friendlyName = "Content Type";
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,5 +1,5 @@
//
-// Pkcs9DocumentDescription.cs -
System.Security.Cryptography.Pkcs.Pkcs9DocumentDescription
+// System.Security.Cryptography.Pkcs.Pkcs9DocumentDescription class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
@@ -35,7 +35,7 @@
namespace System.Security.Cryptography.Pkcs {
- public sealed class Pkcs9DocumentDescription : Pkcs9Attribute {
+ public sealed class Pkcs9DocumentDescription : Pkcs9AttributeObject {
internal const string oid = "1.3.6.1.4.1.311.88.2.2";
internal const string friendlyName = null;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -35,7 +35,7 @@
namespace System.Security.Cryptography.Pkcs {
- public sealed class Pkcs9DocumentName : Pkcs9Attribute {
+ public sealed class Pkcs9DocumentName : Pkcs9AttributeObject {
internal const string oid = "1.3.6.1.4.1.311.88.2.1";
internal const string friendlyName = null;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9MessageDigest.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,5 +1,5 @@
//
-// Pkcs9MessageDigest.cs - System.Security.Cryptography.Pkcs.Pkcs9MessageDigest
+// System.Security.Cryptography.Pkcs.Pkcs9MessageDigest class
//
// Authors:
// Tim Coleman ([EMAIL PROTECTED])
@@ -33,7 +33,7 @@
namespace System.Security.Cryptography.Pkcs {
[MonoTODO ("missing internals")]
- public sealed class Pkcs9MessageDigest : Pkcs9Attribute {
+ public sealed class Pkcs9MessageDigest : Pkcs9AttributeObject {
internal const string oid = "1.2.840.113549.1.9.4";
internal const string friendlyName = "Message Digest";
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,5 +1,5 @@
//
-// Pkcs9SigningTime.cs - System.Security.Cryptography.Pkcs.Pkcs9SigningTime
+// System.Security.Cryptography.Pkcs.Pkcs9SigningTime class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
@@ -36,7 +36,7 @@
namespace System.Security.Cryptography.Pkcs {
- public sealed class Pkcs9SigningTime : Pkcs9Attribute {
+ public sealed class Pkcs9SigningTime : Pkcs9AttributeObject {
internal const string oid = "1.2.840.113549.1.9.5";
internal const string friendlyName = "Signing Time";
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedCms.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// System.Security.Cryptography.Pkcs.SignedCms
+// System.Security.Cryptography.Pkcs.SignedCms class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.Xml;
using System.Text;
@@ -44,7 +43,7 @@
private ContentInfo _content;
private bool _detached;
private SignerInfoCollection _info;
- private X509CertificateExCollection _certs;
+ private X509Certificate2Collection _certs;
private SubjectIdentifierType _type;
private int _version;
@@ -52,7 +51,7 @@
public SignedCms ()
{
- _certs = new X509CertificateExCollection ();
+ _certs = new X509Certificate2Collection ();
_info = new SignerInfoCollection ();
}
@@ -93,7 +92,7 @@
// properties
- public X509CertificateExCollection Certificates {
+ public X509Certificate2Collection Certificates {
get { return _certs; }
}
@@ -128,7 +127,7 @@
}
}
- public void CheckSignature (X509CertificateExCollection
extraStore, bool verifySignatureOnly)
+ public void CheckSignature (X509Certificate2Collection
extraStore, bool verifySignatureOnly)
{
foreach (SignerInfo si in _info) {
si.CheckSignature (extraStore,
verifySignatureOnly);
@@ -204,9 +203,9 @@
SubjectIdentifierType type =
SubjectIdentifierType.Unknown;
object o = null;
- X509CertificateEx x509 = null;
+ X509Certificate2 x509 = null;
if (sd.SignerInfo.Certificate != null) {
- x509 = new X509CertificateEx
(sd.SignerInfo.Certificate.RawData);
+ x509 = new X509Certificate2
(sd.SignerInfo.Certificate.RawData);
}
else if ((sd.SignerInfo.IssuerName != null) &&
(sd.SignerInfo.SerialNumber != null)) {
byte[] serial = sd.SignerInfo.SerialNumber;
@@ -220,7 +219,7 @@
foreach (Mono.Security.X509.X509Certificate x
in sd.Certificates) {
if (x.IssuerName ==
sd.SignerInfo.IssuerName) {
if (ToString (x.SerialNumber)
== xis.SerialNumber) {
- x509 = new
X509CertificateEx (x.RawData);
+ x509 = new
X509Certificate2 (x.RawData);
break;
}
}
@@ -233,7 +232,7 @@
// TODO: move to a FindCertificate (ski,
collection)
foreach (Mono.Security.X509.X509Certificate x
in sd.Certificates) {
if (ToString (GetKeyIdentifier (x)) ==
ski) {
- x509 = new X509CertificateEx
(x.RawData);
+ x509 = new X509Certificate2
(x.RawData);
break;
}
}
@@ -249,7 +248,7 @@
_content = new ContentInfo (oid, content[0].Value);
foreach (Mono.Security.X509.X509Certificate x in
sd.Certificates) {
- _certs.Add (new X509CertificateEx (x.RawData));
+ _certs.Add (new X509Certificate2 (x.RawData));
}
_version = sd.Version;
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs
2005-04-23 14:15:49 UTC (rev 43481)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs
2005-04-23 14:19:12 UTC (rev 43482)
@@ -1,11 +1,11 @@
//
-// SignerInfo.cs - System.Security.Cryptography.Pkcs.SignerInfo
+// System.Security.Cryptography.Pkcs.SignerInfo class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
//
// (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
@@ -29,7 +29,6 @@
#if NET_2_0
-using System;
using System.Security.Cryptography.X509Certificates;
namespace System.Security.Cryptography.Pkcs {
@@ -37,32 +36,32 @@
public sealed class SignerInfo {
private SubjectIdentifier _signer;
- private X509CertificateEx _certificate;
+ private X509Certificate2 _certificate;
private Oid _digest;
private SignerInfoCollection _counter;
- private CryptographicAttributeCollection _signed;
- private CryptographicAttributeCollection _unsigned;
+ private CryptographicAttributeObjectCollection _signed;
+ private CryptographicAttributeObjectCollection _unsigned;
private int _version;
// only accessible from SignedPkcs7.SignerInfos
- internal SignerInfo (string hashOid, X509CertificateEx
certificate, SubjectIdentifierType type, object o, int version)
+ internal SignerInfo (string hashOid, X509Certificate2
certificate, SubjectIdentifierType type, object o, int version)
{
_digest = new Oid (hashOid);
_certificate = certificate;
_counter = new SignerInfoCollection ();
- _signed = new CryptographicAttributeCollection ();
- _unsigned = new CryptographicAttributeCollection ();
+ _signed = new CryptographicAttributeObjectCollection ();
+ _unsigned = new CryptographicAttributeObjectCollection
();
_signer = new SubjectIdentifier (type, o);
_version = version;
}
// properties
- public CryptographicAttributeCollection SignedAttributes {
+ public CryptographicAttributeObjectCollection SignedAttributes {
get { return _signed; }
}
- public X509CertificateEx Certificate {
+ public X509Certificate2 Certificate {
get { return _certificate; }
}
@@ -78,7 +77,7 @@
get { return _signer; }
}
- public CryptographicAttributeCollection UnsignedAttributes {
+ public CryptographicAttributeObjectCollection
UnsignedAttributes {
get { return _unsigned; }
}
@@ -99,7 +98,7 @@
}
[MonoTODO]
- public void CheckSignature (X509CertificateExCollection
extraStore, bool verifySignatureOnly)
+ public void CheckSignature (X509Certificate2Collection
extraStore, bool verifySignatureOnly)
{
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
