Merge pull request #1843 from info-lvsys/patch-1

Added sha512 and sha256 ; and defaults to SHA512

diff --git a/mcs/tools/security/makecert.cs b/mcs/tools/security/makecert.cs
index 99baefdd8b75df074ceaff4f1170f692230f1283..05d662c03981c979db50a7345cf556c49dc040e5 100644 (file)
--- a/mcs/tools/security/makecert.cs
+++ b/mcs/tools/security/makecert.cs
@@ -105,7 +105,7 @@ namespace Mono.Tools {
                        RSA subjectKey = (RSA)RSA.Create ();
 
                        bool selfSigned = false;
-                       string hashName = "SHA1";
+                       string hashName = "SHA512";
 
                        CspParameters subjectParams = new CspParameters ();
                        CspParameters issuerParams = new CspParameters ();
@@ -150,11 +150,18 @@ namespace Mono.Tools {
                                                case "-a":
                                                        // hash algorithm
                                                        switch (args [i++].ToLower ()) {
+                                                               case "sha512":
+                                                                       hashName = "SHA512";
+                                                                       break;
+                                                               case "sha256":
+                                                                       hashName = "SHA256";
+                                                                       break;
                                                                case "sha1":
+                                                                       Console.WriteLine ("WARNING: SHA1 is not safe for this usage.");
                                                                        hashName = "SHA1";
                                                                        break;
                                                                case "md5":
-                                                                       Console.WriteLine ("WARNING: MD5 is no more safe for this usage.");
+                                                                       Console.WriteLine ("WARNING: MD5 is not  safe for this usage.");
                                                                        hashName = "MD5";
                                                                        break;
                                                                default: