bump referencesource for System.Data (remove wrong MDAC ver. check for Odbc)

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

diff --git a/mcs/tools/security/secutil.cs b/mcs/tools/security/secutil.cs
index 30f4f5598be339185959481a421f1f2e7b726d8b..b68dffebf295b11be9481a691db2bf329c77e9a5 100644 (file)
--- a/mcs/tools/security/secutil.cs
+++ b/mcs/tools/security/secutil.cs
@@ -47,12 +47,18 @@ class SecUtil {
        static private void StrongName (string fileName) 
        {
                AssemblyName an = AssemblyName.GetAssemblyName (fileName);
-               Console.WriteLine ("PublicKey =");
-               WriteArray (an.GetPublicKey ());
-               Console.WriteLine ("Name =");
-               Console.WriteLine (an.Name);
-               Console.WriteLine ("Version =");
-               Console.WriteLine (an.Version.ToString ());
+               byte[] key = an.GetPublicKey ();
+
+               if (key == null) {
+                       error = "Error: Assembly has no strong name";
+               } else {
+                       Console.WriteLine ("PublicKey =");
+                       WriteArray (key);
+                       Console.WriteLine ("Name =");
+                       Console.WriteLine (an.Name);
+                       Console.WriteLine ("Version =");
+                       Console.WriteLine (an.Version.ToString ());
+               }
        }
 
        static private void Certificate (string fileName) 
@@ -109,7 +115,7 @@ class SecUtil {
                Header();
 
                try {
-                       for (int i=0; i < args.Length; i++) {
+                       for (int i=0; i < args.Length - 1; i++) {
                                switch (args[i]) {
                                case "-s":
                                case "-strongname":