diff options
Diffstat (limited to 'mcs')
31 files changed, 65 insertions, 59 deletions
diff --git a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs index bdf400672ca..505fea881fb 100644 --- a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs +++ b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs @@ -44,5 +44,5 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: Guid("1ea4dbf0-3c3b-11cf-810c-00aa00389b71")] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs index 20de39d8059..34075f91a1e 100644 --- a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs +++ b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs @@ -28,5 +28,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs b/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs index 177a4f0e70a..faccca0088b 100644 --- a/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs +++ b/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs @@ -53,6 +53,6 @@ using System.Runtime.CompilerServices; // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFile("../ecma.pub")]
[assembly: AssemblyKeyName("")]
diff --git a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs index d8d59d46aa1..18da959a247 100644 --- a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs @@ -36,4 +36,4 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers()] [assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/Microsoft.Web.Services/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Web.Services/Assembly/AssemblyInfo.cs index 5f27c63eb0e..91cd1df3f9d 100755 --- a/mcs/class/Microsoft.Web.Services/Assembly/AssemblyInfo.cs +++ b/mcs/class/Microsoft.Web.Services/Assembly/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyInformationalVersion("0.0.0.1")] [assembly: NeutralResourcesLanguage("en-US")] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs index b212d7f33db..279fc0ab0c1 100644 --- a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs @@ -18,3 +18,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyProduct("MONO CLI")] [assembly: AssemblyCopyright("(c) 2003 Various Authors")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs index d0562eec08d..ce47bd34f21 100755 --- a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly:SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode=true)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")] +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs index 1b393e2655e..179e312b1bb 100755 --- a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs @@ -45,5 +45,5 @@ using System.Runtime.InteropServices; //[assembly:SecurityPermission (SecurityAction.RequestOptional, UnmanagedCode=true)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")] +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/Mono.Security/Mono.Security/StrongName.cs b/mcs/class/Mono.Security/Mono.Security/StrongName.cs index f6fe1e88e04..b95525ba479 100644 --- a/mcs/class/Mono.Security/Mono.Security/StrongName.cs +++ b/mcs/class/Mono.Security/Mono.Security/StrongName.cs @@ -408,17 +408,22 @@ namespace Mono.Security { sn = StrongHash (fs, StrongNameOptions.Signature); fs.Close (); } - if (sn.Hash == null) + if (sn.Hash == null) { + Console.WriteLine ("hash is null"); return false; + } try { AssemblyHashAlgorithm algorithm = AssemblyHashAlgorithm.SHA1; if (tokenAlgorithm == "MD5") algorithm = AssemblyHashAlgorithm.MD5; - return Verify (rsa, algorithm, sn.Hash, sn.Signature); + bool v = Verify (rsa, algorithm, sn.Hash, sn.Signature); + Console.WriteLine ("returning v: " + v); + return v; } - catch (CryptographicException) { + catch (CryptographicException e) { // no exception allowed + Console.WriteLine ("exception: " + e); return false; } } diff --git a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs index baf0fc42dfc..71456086222 100644 --- a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs @@ -42,5 +42,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Data.ObjectSpaces/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.ObjectSpaces/Assembly/AssemblyInfo.cs index 93d88135e04..c645490735c 100644 --- a/mcs/class/System.Data.ObjectSpaces/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.ObjectSpaces/Assembly/AssemblyInfo.cs @@ -44,5 +44,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs index cb9bec670e5..a3be307a50c 100644 --- a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs index aeb41bb6e22..b078c62f0a9 100644 --- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Design/Assembly/AssemblyInfo.cs index 06cdb18e261..234c8d9faf2 100644 --- a/mcs/class/System.Design/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Design/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs index 3797639fd78..7b21a676390 100644 --- a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs @@ -40,5 +40,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] -//[assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs index 6d150bf3456..15413b6e151 100644 --- a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs @@ -40,4 +40,4 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("..\\..\\MonoKey.snk")] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs index 38195147a9e..39de6a2babb 100644 --- a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs index b682c845c2f..9119ad45d4c 100644 --- a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs @@ -40,5 +40,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Management/Assembly/AssemblyInfo.cs b/mcs/class/System.Management/Assembly/AssemblyInfo.cs index cd9489e03da..39ac0f7a290 100644 --- a/mcs/class/System.Management/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Management/Assembly/AssemblyInfo.cs @@ -35,6 +35,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyName ("")] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs index a26b2ea07c1..5ed1da03e0e 100644 --- a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs @@ -40,5 +40,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs index 1ed5abd8903..c31fcf4a7d4 100644 --- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs @@ -38,5 +38,5 @@ using System.Runtime.InteropServices; [assembly: CLSCompliant(true)] [assembly: NeutralResourcesLanguage("en-US")] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs index 3998c75aa6f..5d17da743ca 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs @@ -38,5 +38,5 @@ using System.Runtime.InteropServices; [assembly: CLSCompliant(true)] [assembly: NeutralResourcesLanguage("en-US")] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Security/Assembly/AssemblyInfo.cs b/mcs/class/System.Security/Assembly/AssemblyInfo.cs index f5812318a0d..7f051cd4a41 100755 --- a/mcs/class/System.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Security/Assembly/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] [assembly: NeutralResourcesLanguage ("en-US")] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")] +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs index a9b3136bf93..3aed3f20172 100644 --- a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs @@ -40,5 +40,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Web.Mobile/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Mobile/Assembly/AssemblyInfo.cs index e31d2fa1639..adb92fe4b13 100644 --- a/mcs/class/System.Web.Mobile/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Web.Mobile/Assembly/AssemblyInfo.cs @@ -42,5 +42,5 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: ComVisible (false)] -//[assembly: AssemblyDelaySign (true)] -//[assembly: AssemblyKeyFile ("")]
\ No newline at end of file +[assembly: AssemblyDelaySign (true)] +[assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs index 5674cb77ac8..116caf9531f 100644 --- a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs @@ -42,4 +42,4 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("..\\..\\ECMAKey.snk")]
\ No newline at end of file +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.Web/Assembly/AssemblyInfo.cs index 5cd79f7551b..3dd07d8e026 100644 --- a/mcs/class/System.Web/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Web/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Web.UI; [assembly: AllowPartiallyTrustedCallers()] [assembly: TagPrefix("System.Web.UI.WebControls", "asp")] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs b/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs index 093c60e01e2..bce9efa8399 100644 --- a/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers()] -//[assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System.XML/Assembly/AssemblyInfo.cs b/mcs/class/System.XML/Assembly/AssemblyInfo.cs index d258d00f87d..c3eeb6fa896 100644 --- a/mcs/class/System.XML/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.XML/Assembly/AssemblyInfo.cs @@ -41,5 +41,5 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs index 23142610f3e..be37aeb96c8 100644 --- a/mcs/class/System/Assembly/AssemblyInfo.cs +++ b/mcs/class/System/Assembly/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: ComVisible(false)] -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")]
\ No newline at end of file +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs index 06a0c226abd..619e8b92c41 100644 --- a/mcs/class/corlib/Assembly/AssemblyInfo.cs +++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs @@ -42,5 +42,5 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: Guid("BED7F4EA-1A96-11D2-8F08-00A0C9A6186D")] -//[assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFile("../../EcmaKey.snk")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFile("../ecma.pub")] |