Merge pull request #2350 from akoeplinger/signcode-sha1

[signcode] Change default hashing algorithm from MD5 to SHA1

diff --git a/man/signcode.1 b/man/signcode.1
index b449eb1d304867a29d55e98842367bed64d5c70c..777182618cb16484fd4ee0e18b128ea3aa03bf9a 100644 (file)
--- a/man/signcode.1
+++ b/man/signcode.1
@@ -27,9 +27,9 @@ The Private Key File (pvk) that contains the private key used to digitally
 sign the PE executable. This private key must match the public key inside the
 publisher X.509 certificate.
 .TP
-.I "-a md5 | sha1"
+.I "-a sha1 | md5"
 The hash algorithm used in the digital signature of the PE executable. The 
-default algorithm is MD5.
+default algorithm is SHA1.
 .TP
 .I "-$ individual | commercial"
 Add information about the publisher, i.e. if the signature is generated by an

diff --git a/mcs/class/Mono.Security/Mono.Security.Authenticode/AuthenticodeFormatter.cs b/mcs/class/Mono.Security/Mono.Security.Authenticode/AuthenticodeFormatter.cs
index 3790c194f013bccf2564bb7c3115a8beec129d24..f91a3a959487c58d2204eb36917fe3076b84e101 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Authenticode/AuthenticodeFormatter.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Authenticode/AuthenticodeFormatter.cs
@@ -77,7 +77,7 @@ namespace Mono.Security.Authenticode {
                public string Hash {
                        get { 
                                if (hash == null)
-                                       hash = "MD5";
+                                       hash = "SHA1";
                                return hash; 
                        }
                        set {

diff --git a/mcs/tools/security/signcode.cs b/mcs/tools/security/signcode.cs
index 2e8d475e6434a95c139859a09cd28922952f917c..1a8047134c0084d631c9a56aa75ca37b5534d0d8 100644 (file)
--- a/mcs/tools/security/signcode.cs
+++ b/mcs/tools/security/signcode.cs
@@ -35,7 +35,7 @@ namespace Mono.Tools {
                        Console.WriteLine ("Usage: signcode [options] filename{0}", Environment.NewLine);
                        Console.WriteLine ("\t-spc spc\tSoftware Publisher Certificate file");
                        Console.WriteLine ("\t-v pvk\t\tPrivate Key file");
-                       Console.WriteLine ("\t-a md5 | sha1\tHash Algorithm (default: MD5)");
+                       Console.WriteLine ("\t-a sha1 | md5\tHash Algorithm (default: SHA1)");
                        Console.WriteLine ("\t-$ indivisual | commercial\tSignature type");
                        Console.WriteLine ("\t-n description\tDescription for the signed file");
                        Console.WriteLine ("\t-i url\tURL for the signed file");