Don't ignore quiet mode on resign and verify

[mono.git] / mcs / tools / security / makecert.cs

diff --git a/mcs/tools/security/makecert.cs b/mcs/tools/security/makecert.cs
index b49134844d5f613aaafb151eb52319f1be0b3c5a..99baefdd8b75df074ceaff4f1170f692230f1283 100644 (file)
--- a/mcs/tools/security/makecert.cs
+++ b/mcs/tools/security/makecert.cs
@@ -9,6 +9,7 @@
 //
 
 using System;
+using System.Collections;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
@@ -110,6 +111,7 @@ namespace Mono.Tools {
                        CspParameters issuerParams = new CspParameters ();
                        BasicConstraintsExtension bce = null;
                        ExtendedKeyUsageExtension eku = null;
+                       SubjectAltNameExtension alt = null;
                        string p12file = null;
                        string p12pwd = null;
                        X509Certificate issuerCertificate = null;
@@ -213,6 +215,12 @@ namespace Mono.Tools {
                                                        }
                                                        bce.PathLenConstraint = Convert.ToInt32 (args [i++]);
                                                        break;
+                                               case "-alt":
+                                                       if (alt == null) {
+                                                               string [] dnsNames = File.ReadAllLines (args [i++]);
+                                                               alt = new SubjectAltNameExtension (null, dnsNames, null, null);
+                                                       }
+                                                       break;
                                                case "-ic":
                                                        issuerCertificate = LoadCertificate (args [i++]);
                                                        issuer = issuerCertificate.SubjectName;
@@ -392,6 +400,8 @@ namespace Mono.Tools {
                                        cb.Extensions.Add (bce);
                                if (eku != null)
                                        cb.Extensions.Add (eku);
+                               if (alt != null)
+                                       cb.Extensions.Add (alt);
                                // signature
                                cb.Hash = hashName;
                                byte[] rawcert = cb.Sign (issuerKey);
@@ -401,10 +411,18 @@ namespace Mono.Tools {
                                } else {
                                        PKCS12 p12 = new PKCS12 ();
                                        p12.Password = p12pwd;
-                                       p12.AddCertificate (new X509Certificate (rawcert));
+
+                                       ArrayList list = new ArrayList ();
+                                       // we use a fixed array to avoid endianess issues 
+                                       // (in case some tools requires the ID to be 1).
+                                       list.Add (new byte [4] { 1, 0, 0, 0 });
+                                       Hashtable attributes = new Hashtable (1);
+                                       attributes.Add (PKCS9.localKeyId, list);
+
+                                       p12.AddCertificate (new X509Certificate (rawcert), attributes);
                                        if (issuerCertificate != null)
                                                p12.AddCertificate (issuerCertificate);
-                                       p12.AddPkcs8ShroudedKeyBag (subjectKey);
+                                       p12.AddPkcs8ShroudedKeyBag (subjectKey, attributes);
                                        p12.SaveToFile (p12file);
                                }
                                Console.WriteLine ("Success");