Author: spouliot
Date: 2005-04-23 10:09:12 -0400 (Sat, 23 Apr 2005)
New Revision: 43480
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/ChangeLog
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs
Log:
2005-04-23 Sebastien Pouliot <[EMAIL PROTECTED]>
* X509CertificateEx.cs, X509CertificateExCollection.cs,
X509CertificateExEnumerator.cs, X509Chain.cs, X509ChainElement.cs,
X509ChainPolicy.cs, X509Store.cs: Changed all references of
X509CertificateEx to X509Certificate2 to match beta2.
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/ChangeLog
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/ChangeLog
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/ChangeLog
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,3 +1,10 @@
+2005-04-23 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * X509CertificateEx.cs, X509CertificateExCollection.cs,
+ X509CertificateExEnumerator.cs, X509Chain.cs, X509ChainElement.cs,
+ X509ChainPolicy.cs, X509Store.cs: Changed all references of
+ X509CertificateEx to X509Certificate2 to match beta2.
+
2005-01-17 Sebastien Pouliot <[EMAIL PROTECTED]>
* X509BasicConstraintsExtension.cs: Completed implementation.
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,11 +1,11 @@
//
-// X509CertificateEx.cs - System.Security.Cryptography.X509CertificateEx
+// System.Security.Cryptography.X509Certificate2 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
@@ -36,7 +36,7 @@
namespace System.Security.Cryptography.X509Certificates {
- public class X509CertificateEx : X509Certificate {
+ public class X509Certificate2 : X509Certificate {
private bool _archived;
private X509ExtensionCollection _extensions;
@@ -48,49 +48,49 @@
// constructors
- public X509CertificateEx () : base ()
+ public X509Certificate2 () : base ()
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (byte[] rawData) : base (rawData)
+ public X509Certificate2 (byte[] rawData) : base (rawData)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (byte[] rawData, string password) :
base (rawData, password)
+ public X509Certificate2 (byte[] rawData, string password) :
base (rawData, password)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (byte[] rawData, string password,
X509KeyStorageFlags keyStorageFlags)
+ public X509Certificate2 (byte[] rawData, string password,
X509KeyStorageFlags keyStorageFlags)
: base (rawData, password, keyStorageFlags)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (string fileName) : base (fileName)
+ public X509Certificate2 (string fileName) : base (fileName)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (string fileName, string password)
+ public X509Certificate2 (string fileName, string password)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (string fileName, string password,
X509KeyStorageFlags keyStorageFlags)
+ public X509Certificate2 (string fileName, string password,
X509KeyStorageFlags keyStorageFlags)
: base (fileName, password, keyStorageFlags)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (IntPtr handle) : base (handle)
+ public X509Certificate2 (IntPtr handle) : base (handle)
{
_cert = new MX.X509Certificate (this.RawData);
}
- public X509CertificateEx (X509CertificateEx certificate)
+ public X509Certificate2 (X509Certificate2 certificate)
{
_cert = new MX.X509Certificate (this.RawData);
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,15 +1,14 @@
//
-// X509CertificateExCollection.cs -
System.Security.Cryptography.X509Certificates.X509CertificateExCollection
+// System.Security.Cryptography.X509Certificates.X509Certificate2Collection
class
//
-// Author:
-// Sebastien Pouliot ([EMAIL PROTECTED])
+// Authors:
+// Sebastien Pouliot <[EMAIL PROTECTED]>
// Tim Coleman ([EMAIL PROTECTED])
//
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
// Copyright (C) Tim Coleman, 2004
+// 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
@@ -32,45 +31,44 @@
#if NET_2_0
-using System;
using System.Collections;
namespace System.Security.Cryptography.X509Certificates {
- // Note: Match the definition of framework version 1.2.3400.0 on
http://longhorn.msdn.microsoft.com
+ public sealed class X509Certificate2Collection :
X509CertificateCollection {
- public sealed class X509CertificateExCollection :
X509CertificateCollection {
-
// constructors
- public X509CertificateExCollection () {}
+ public X509Certificate2Collection ()
+ {
+ }
- public X509CertificateExCollection (X509CertificateExCollection
certificates)
+ public X509Certificate2Collection (X509Certificate2Collection
certificates)
{
AddRange (certificates);
}
- public X509CertificateExCollection (X509CertificateEx[]
certificates)
+ public X509Certificate2Collection (X509Certificate2[]
certificates)
{
AddRange (certificates);
}
// properties
- public new X509CertificateEx this [int index] {
+ public new X509Certificate2 this [int index] {
get {
if (index < 0)
throw new ArgumentOutOfRangeException
("negative index");
if (index >= InnerList.Count)
throw new ArgumentOutOfRangeException
("index >= Count");
- return (X509CertificateEx) InnerList [index];
+ return (X509Certificate2) InnerList [index];
}
set { InnerList [index] = value; }
}
// methods
- public int Add (X509CertificateEx certificate)
+ public int Add (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -79,7 +77,7 @@
}
// note: transactional
- public void AddRange (X509CertificateEx[] certificates)
+ public void AddRange (X509Certificate2[] certificates)
{
if (certificates == null)
throw new ArgumentNullException
("certificates");
@@ -89,7 +87,7 @@
}
// note: transactional
- public void AddRange (X509CertificateExCollection certificates)
+ public void AddRange (X509Certificate2Collection certificates)
{
if (certificates == null)
throw new ArgumentNullException
("certificates");
@@ -97,12 +95,12 @@
InnerList.AddRange (certificates);
}
- public bool Contains (X509CertificateEx certificate)
+ public bool Contains (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
- foreach (X509CertificateEx c in InnerList) {
+ foreach (X509Certificate2 c in InnerList) {
if (certificate.Equals (c))
return true;
}
@@ -119,12 +117,12 @@
return null;
}
- public X509CertificateExCollection Find (X509FindType findType,
object findValue, bool validOnly)
+ public X509Certificate2Collection Find (X509FindType findType,
object findValue, bool validOnly)
{
return null;
}
- public new X509CertificateExEnumerator GetEnumerator ()
+ public new X509Certificate2Enumerator GetEnumerator ()
{
return null;
}
@@ -145,7 +143,7 @@
{
}
- public void Insert (int index, X509CertificateEx certificate)
+ public void Insert (int index, X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -157,13 +155,13 @@
InnerList.Insert (index, certificate);
}
- public void Remove (X509CertificateEx certificate)
+ public void Remove (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
for (int i=0; i < InnerList.Count; i++) {
- X509CertificateEx c = (X509CertificateEx)
InnerList [i];
+ X509Certificate2 c = (X509Certificate2)
InnerList [i];
if (certificate.Equals (c)) {
InnerList.RemoveAt (i);
// only first instance is removed
@@ -173,27 +171,27 @@
}
// note: transactional
- public void RemoveRange (X509CertificateEx[] certificates)
+ public void RemoveRange (X509Certificate2[] certificates)
{
if (certificates == null)
throw new ArgumentNullException ("certificate");
}
// note: transactional
- public void RemoveRange (X509CertificateExCollection
certificates)
+ public void RemoveRange (X509Certificate2Collection
certificates)
{
if (certificates == null)
throw new ArgumentNullException ("certificate");
}
// note: UI
- public X509CertificateExCollection Select (string title, string
message, X509SelectionFlag selectionFlag)
+ public X509Certificate2Collection Select (string title, string
message, X509SelectionFlag selectionFlag)
{
return null;
}
// note: UI
- public X509CertificateExCollection Select (string title, string
message, X509SelectionFlag selectionFlag, IntPtr hwndParent)
+ public X509Certificate2Collection Select (string title, string
message, X509SelectionFlag selectionFlag, IntPtr hwndParent)
{
return null;
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,13 +1,12 @@
//
-// X509CertificateExEnumerator.cs -
System.Security.Cryptography.X509Certificates.X509CertificateExEnumerator
+// System.Security.Cryptography.X509Certificates.X509Certificate2Enumerator
class
//
// 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)
//
-
-//
// 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
@@ -30,26 +29,23 @@
#if NET_2_0
-using System;
using System.Collections;
namespace System.Security.Cryptography.X509Certificates {
- // Note: Match the definition of framework version 1.2.3400.0 on
http://longhorn.msdn.microsoft.com
+ public sealed class X509Certificate2Enumerator : IEnumerator {
- public sealed class X509CertificateExEnumerator : IEnumerator {
-
private IEnumerator enumerator;
- internal X509CertificateExEnumerator
(X509CertificateExCollection collection)
+ internal X509Certificate2Enumerator (X509Certificate2Collection
collection)
{
enumerator = ((IEnumerable) collection).GetEnumerator
();
}
// properties
- public X509CertificateEx Current {
- get { return (X509CertificateEx) enumerator.Current; }
+ public X509Certificate2 Current {
+ get { return (X509Certificate2) enumerator.Current; }
}
object IEnumerator.Current {
@@ -70,4 +66,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -83,7 +83,7 @@
// methods
[MonoTODO]
- public bool Build (X509CertificateEx certificate)
+ public bool Build (X509Certificate2 certificate)
{
return false;
}
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -2,12 +2,11 @@
// X509ChainElement.cs -
System.Security.Cryptography.X509Certificates.X509ChainElement
//
// 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)
//
-
-//
// 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
@@ -30,23 +29,21 @@
#if NET_2_0
-using System;
-
namespace System.Security.Cryptography.X509Certificates {
- // Note: Match the definition of framework version 1.2.3400.0 on
http://longhorn.msdn.microsoft.com
-
public class X509ChainElement {
// constructors
// only accessible from X509Chain.ChainElements
- internal X509ChainElement () {}
+ internal X509ChainElement ()
+ {
+ }
// properties
[MonoTODO]
- public X509CertificateEx Certificate {
+ public X509Certificate2 Certificate {
get { return null; }
}
@@ -62,4 +59,4 @@
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,5 +1,5 @@
//
-// X509ChainPolicy.cs -
System.Security.Cryptography.X509Certificates.X509ChainPolicy
+// System.Security.Cryptography.X509Certificates.X509ChainPolicy class
//
// Author:
// Sebastien Pouliot <[EMAIL PROTECTED]>
@@ -35,7 +35,7 @@
private OidCollection _apps;
private OidCollection _cert;
- private X509CertificateExCollection _store;
+ private X509Certificate2Collection _store;
private X509RevocationFlag _rflag;
private X509RevocationMode _mode;
private TimeSpan _timeout;
@@ -59,7 +59,7 @@
get { return _cert; }
}
- public X509CertificateExCollection ExtraStore {
+ public X509Certificate2Collection ExtraStore {
get { return _store; }
}
@@ -94,7 +94,7 @@
{
_apps = new OidCollection ();
_cert = new OidCollection ();
- _store = new X509CertificateExCollection ();
+ _store = new X509Certificate2Collection ();
_rflag = X509RevocationFlag.ExcludeRoot;
_mode = X509RevocationMode.Online;
_timeout = new TimeSpan (0);
Modified:
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs
===================================================================
---
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs
2005-04-23 14:06:56 UTC (rev 43479)
+++
trunk/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs
2005-04-23 14:09:12 UTC (rev 43480)
@@ -1,11 +1,11 @@
//
-// X509Store.cs - System.Security.Cryptography.X509Certificates.X509Store
+// System.Security.Cryptography.X509Certificates.X509Store 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;
-
using Mono.Security.X509;
namespace System.Security.Cryptography.X509Certificates {
@@ -39,7 +37,7 @@
private string _name;
private StoreLocation _location;
- private X509CertificateExCollection _certs;
+ private X509Certificate2Collection _certs;
private OpenFlags _flags;
// constructors
@@ -82,10 +80,10 @@
// properties
- public X509CertificateExCollection Certificates {
+ public X509Certificate2Collection Certificates {
get {
if (_certs == null)
- _certs = new
X509CertificateExCollection ();
+ _certs = new X509Certificate2Collection
();
return _certs;
}
}
@@ -115,7 +113,7 @@
}
[MonoTODO ("call Mono.Security.X509.X509Store*")]
- public void Add (X509CertificateEx certificate)
+ public void Add (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -131,13 +129,13 @@
}
}
- public void AddRange (X509CertificateExCollection certificates)
+ public void AddRange (X509Certificate2Collection certificates)
{
if (certificates == null)
throw new ArgumentNullException
("certificates");
if (!ReadOnly) {
- foreach (X509CertificateEx certificate in
certificates) {
+ foreach (X509Certificate2 certificate in
certificates) {
Add (certificate);
}
}
@@ -159,7 +157,7 @@
}
[MonoTODO ("call Mono.Security.X509.X509Store*")]
- public void Remove (X509CertificateEx certificate)
+ public void Remove (X509Certificate2 certificate)
{
if (certificate == null)
throw new ArgumentNullException ("certificate");
@@ -175,13 +173,13 @@
}
}
- public void RemoveRange (X509CertificateExCollection
certificates)
+ public void RemoveRange (X509Certificate2Collection
certificates)
{
if (certificates == null)
throw new ArgumentNullException
("certificates");
if (!this.ReadOnly) {
- foreach (X509CertificateEx certificate in
certificates) {
+ foreach (X509Certificate2 certificate in
certificates) {
Remove (certificate);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
