mono · pruiz · Oct 3, 2010 · Oct 3, 2010 · Oct 3, 2010 · Oct 3, 2010
diff --git a/man/certmgr.1 b/man/certmgr.1
@@ -1,8 +1,10 @@
 .\" 
 .\" certmgr manual page.
 .\" Copyright 2004-2005 Novell
+.\" Copyright 2010 Pablo Ruiz
 .\" Author:
 .\"   Sebastien Pouliot <[email protected]>
+.\"   Pablo Ruiz Garcia <[email protected]>
 .\"
 .TH Mono "certmgr"
 .SH NAME
@@ -24,7 +26,9 @@ server certificates.
 List the certificates, CTL or CTL in the specified store.
 .TP
 .I "-add"
-Add a certificate, CRL or CTL to specified store.
+Add a certificate, CRL or CTL to specified store. If filename it's a pkcs12 
+or pfx file, and it contains a private key, it will be imported to local key
+pair container.
 .TP
 .I "-del"
 Remove a certificate, CRL or CTL from specified store. You must specify the 
@@ -44,6 +48,11 @@ This action assume an certificate (-c) object type and will import the
 certificates in appropriate stores (i.e. server certificate in the 
 OtherPeople store, the root certificate in the Trust store, any other 
 intermediate certificates in the IntermediateCA store).
+.TP
+.I "-importKey"
+Allows importing a private key from a pkcs12 file into a local key pair
+store. (Usefull when you already have the key's corresponding certificate
+installed at the specific store.)
 
 .SH OBJECT TYPES
 .TP
@@ -66,6 +75,9 @@ Use the machine's certificate stores (instead of the default user's stores).
 .I "-v"
 More details displayed on the console.
 .TP
+.I "-p password"
+Use the specify password when accessing a pkcs12 file.
+.TP
 .I "-help", "-h", "-?", "/?"
 Display help about this tool.
 
@@ -88,6 +100,9 @@ The filenames either starts with
 (subject key identifier).
 .TP
 The rest of the filename is the base64-encoded value (tbp or ski).
+.TP
+Private key data is stored under
+.I ~/.config/.mono/keypairs/
 
 .SH EXAMPLES
 .TP
@@ -140,6 +155,8 @@ element of your machine.config file.
 
 .SH AUTHOR
 Written by Sebastien Pouliot
+
+Minor additions by Pablo Ruiz García
 .SH COPYRIGHT
 Copyright (C) 2004-2005 Novell.
 .SH MAILING LISTS

diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509Store.cs
@@ -3,8 +3,10 @@
 //
 // Author:
 //	Sebastien Pouliot  <[email protected]>
+//	Pablo Ruiz <[email protected]>
 //
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// (C) 2010 Pablo Ruiz.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -30,8 +32,10 @@
 using System.Collections;
 using System.Globalization;
 using System.IO;
-using System.Text;
-
+using System.Text;
+using System.Security.Cryptography;
+
+using Mono.Security.Cryptography;
 using Mono.Security.X509.Extensions;
 
 namespace Mono.Security.X509 {
@@ -41,8 +45,8 @@ namespace Mono.Security.X509 {
 #else
 	public 
 #endif
-	class X509Store {
-
+	class X509Store {
+
 		private string _storePath;
 		private X509CertificateCollection _certificates;
 		private ArrayList _crls;
@@ -114,6 +118,16 @@ public void Import (X509Certificate certificate)
 					fs.Close ();
 				}
 			}
+
+			// Try to save privateKey if available..
+			CspParameters cspParams = new CspParameters ();
+			cspParams.KeyContainerName = CryptoConvert.ToHex (certificate.Hash);
+
+			// Right now this seems to be the best way to know if we should use LM store.. ;)
+			if (_storePath.StartsWith (X509StoreManager.LocalMachinePath))
+				cspParams.Flags = CspProviderFlags.UseMachineKeyStore;
+
+			ImportPrivateKey (certificate, cspParams);
 		}
 
 		public void Import (X509Crl crl) 
@@ -127,7 +141,7 @@ public void Import (X509Crl crl)
 					fs.Write (data, 0, data.Length);
 				}
 			}
-		}
+		}
 
 		public void Remove (X509Certificate certificate) 
 		{
@@ -188,14 +202,15 @@ private byte[] GetUniqueName (X509ExtensionCollection extensions)
 		private string GetUniqueName (string method, byte[] name, string fileExtension) 
 		{
 			StringBuilder sb = new StringBuilder (method);
+
 			sb.Append ("-");
 			foreach (byte b in name) {
 				sb.Append (b.ToString ("X2", CultureInfo.InvariantCulture));
 			}
 			sb.Append (fileExtension);
 
 			return sb.ToString ();
-		}
+		}
 
 		private byte[] Load (string filename) 
 		{
@@ -212,6 +227,21 @@ private X509Certificate LoadCertificate (string filename)
 		{
 			byte[] data = Load (filename);
 			X509Certificate cert = new X509Certificate (data);
+
+			// If privateKey it's available, load it too..
+			CspParameters cspParams = new CspParameters ();
+			cspParams.KeyContainerName = CryptoConvert.ToHex (cert.Hash);
+			cspParams.Flags = CspProviderFlags.UseMachineKeyStore;
+			KeyPairPersistence kpp = new KeyPairPersistence (cspParams);
+
+			if (!kpp.Load ())
+				return cert;
+
+			if (cert.RSA != null)
+				cert.RSA = new RSACryptoServiceProvider (cspParams);
+			else if (cert.DSA != null)
+				cert.DSA = new DSACryptoServiceProvider (cspParams);
+
 			return cert;
 		}
 
@@ -282,6 +312,41 @@ private ArrayList BuildCrlsCollection (string storeName)
 				}
 			}
 			return list;
+		}
+
+		private void ImportPrivateKey(X509Certificate certificate, CspParameters cspParams)
+		{
+			RSACryptoServiceProvider rsaCsp = certificate.RSA as RSACryptoServiceProvider;
+			if (rsaCsp != null) {
+				if (rsaCsp.PublicOnly)
+					return;
+
+				RSACryptoServiceProvider csp = new RSACryptoServiceProvider(cspParams);
+				csp.ImportParameters(rsaCsp.ExportParameters(true));
+				csp.PersistKeyInCsp = true;
+				return;
+			}
+
+			RSAManaged rsaMng = certificate.RSA as RSAManaged;
+			if (rsaMng != null) {
+				if (rsaMng.PublicOnly)
+					return;
+
+				RSACryptoServiceProvider csp = new RSACryptoServiceProvider(cspParams);
+				csp.ImportParameters(rsaMng.ExportParameters(true));
+				csp.PersistKeyInCsp = true;
+				return;
+			}
+
+			DSACryptoServiceProvider dsaCsp = certificate.DSA as DSACryptoServiceProvider;
+			if (dsaCsp != null) {
+				if (dsaCsp.PublicOnly)
+					return;
+
+				DSACryptoServiceProvider csp = new DSACryptoServiceProvider(cspParams);
+				csp.ImportParameters(dsaCsp.ExportParameters(true));
+				csp.PersistKeyInCsp = true;
+			}
 		}
 	}
 }
diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509StoreManager.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509StoreManager.cs
@@ -41,39 +41,55 @@ namespace Mono.Security.X509 {
 #else
 	public 
 #endif
-	sealed class X509StoreManager {
-
+	sealed class X509StoreManager {
+
+		static private string _userPath;
+		static private string _localMachinePath;
 		static private X509Stores _userStore;
 		static private X509Stores _machineStore;
 
 		private X509StoreManager ()
 		{
 		}
 
-		static public X509Stores CurrentUser {
-			get { 
-				if (_userStore == null) {
-					string _userPath = Path.Combine (
-						Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData),
+		internal static string CurrentUserPath {
+			get {
+				if (_userPath == null) {
+					_userPath = Path.Combine(
+							Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+							".mono");
+					_userPath = Path.Combine(_userPath, "certs");
+				}
+				return _userPath;
+			}
+		}
+
+		internal static string LocalMachinePath {
+			get {
+				if (_localMachinePath == null) {
+					_localMachinePath = Path.Combine (
+						Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData),
 						".mono");
-					_userPath = Path.Combine (_userPath, "certs");
+					_localMachinePath = Path.Combine (_localMachinePath, "certs");
+				}
+				return _localMachinePath;
+			}
+		}
 
-					_userStore = new X509Stores (_userPath);
-				}
+		static public X509Stores CurrentUser {
+			get { 
+				if (_userStore == null)
+					_userStore = new X509Stores(CurrentUserPath);
+
 				return _userStore;
 			}
 		}
 
 		static public X509Stores LocalMachine {
 			get {
-				if (_machineStore == null) {
-					string _machinePath = Path.Combine (
-						Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData),
-						".mono");
-					_machinePath = Path.Combine (_machinePath, "certs");
+				if (_machineStore == null) 
+					_machineStore = new X509Stores (LocalMachinePath);
 
-					_machineStore = new X509Stores (_machinePath);
-				}
 				return _machineStore;
 			}
 		}

diff --git a/...ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataTypeAttribute.cs b/...ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/DataTypeAttribute.cs
@@ -74,10 +74,11 @@ public virtual string GetDataTypeName ()
 			return dt.ToString ();
 		}
 
-		[MonoTODO]
 		public override bool IsValid (object value)
 		{
-			throw new NotImplementedException ();
+			// Returns alwasy true 	
+			// See: http://msdn.microsoft.com/en-us/library/cc679235.aspx
+			return true;
 		}
 	}
 }