Whitespace, comments, unused import, missing test code

5 files changed, 30 insertions, 10 deletions

diff --git a/crypto/bzip2/src/CBZip2OutputStream.cs b/crypto/bzip2/src/CBZip2OutputStream.cs

index 361592796..ffac073fb 100644
--- a/crypto/bzip2/src/CBZip2OutputStream.cs
+++ b/crypto/bzip2/src/CBZip2OutputStream.cs
@@ -406,6 +406,7 @@ namespace Org.BouncyCastle.Apache.Bzip2
                 return;
 
             Finish();
+
             closed = true;
             Platform.Dispose(this.bsStream);
 
diff --git a/crypto/src/asn1/Asn1Set.cs b/crypto/src/asn1/Asn1Set.cs

index 58e7e26f8..18f8020f2 100644
--- a/crypto/src/asn1/Asn1Set.cs
+++ b/crypto/src/asn1/Asn1Set.cs
@@ -75,8 +75,8 @@ namespace Org.BouncyCastle.Asn1
          *          be converted.
          */
         public static Asn1Set GetInstance(
-            Asn1TaggedObject obj,
-            bool explicitly)
+            Asn1TaggedObject	obj,
+            bool				explicitly)
         {
             Asn1Object inner = obj.GetObject();
 
@@ -85,7 +85,7 @@ namespace Org.BouncyCastle.Asn1
                 if (!obj.IsExplicit())
                     throw new ArgumentException("object implicit - explicit expected.");
 
-                return (Asn1Set)inner;
+                return (Asn1Set) inner;
             }
 
             //
@@ -100,7 +100,7 @@ namespace Org.BouncyCastle.Asn1
 
             if (inner is Asn1Set)
             {
-                return (Asn1Set)inner;
+                return (Asn1Set) inner;
             }
 
             //
@@ -110,7 +110,7 @@ namespace Org.BouncyCastle.Asn1
             if (inner is Asn1Sequence)
             {
                 Asn1EncodableVector v = new Asn1EncodableVector();
-                Asn1Sequence s = (Asn1Sequence)inner;
+                Asn1Sequence s = (Asn1Sequence) inner;
 
                 foreach (Asn1Encodable ae in s)
                 {
@@ -149,14 +149,14 @@ namespace Org.BouncyCastle.Asn1
          */
         public virtual Asn1Encodable this[int index]
         {
-            get { return (Asn1Encodable)_set[index]; }
+            get { return (Asn1Encodable) _set[index]; }
         }
 
         [Obsolete("Use 'object[index]' syntax instead")]
         public Asn1Encodable GetObjectAt(
             int index)
         {
-            return this[index];
+             return this[index];
         }
 
         [Obsolete("Use 'Count' property instead")]
@@ -207,8 +207,8 @@ namespace Org.BouncyCastle.Asn1
                     return ((Asn1Set)obj).Parser;
 
                 // NB: Asn1OctetString implements Asn1OctetStringParser directly
-                //				if (obj is Asn1OctetString)
-                //					return ((Asn1OctetString)obj).Parser;
+//				if (obj is Asn1OctetString)
+//					return ((Asn1OctetString)obj).Parser;
 
                 return obj;
             }
diff --git a/crypto/src/asn1/DerGeneralizedTime.cs b/crypto/src/asn1/DerGeneralizedTime.cs

index 4de0feaa6..40ec17b2a 100644
--- a/crypto/src/asn1/DerGeneralizedTime.cs
+++ b/crypto/src/asn1/DerGeneralizedTime.cs
@@ -259,6 +259,9 @@ namespace Org.BouncyCastle.Asn1
 
         private DateTime ParseDateString(string	s, string format, bool makeUniversal)
         {
+            /*
+             * NOTE: DateTime.Kind and DateTimeStyles.AssumeUniversal not available in .NET 1.1
+             */
             DateTimeStyles style = DateTimeStyles.None;
             if (format.EndsWith("Z"))
             {
diff --git a/crypto/src/pkcs/Pkcs12Store.cs b/crypto/src/pkcs/Pkcs12Store.cs

index a024bcd6b..ba3c208e8 100644
--- a/crypto/src/pkcs/Pkcs12Store.cs
+++ b/crypto/src/pkcs/Pkcs12Store.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
 
diff --git a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs

index c9f2e0ca2..534e8a471 100644
--- a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
+++ b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Text;
 
+using NUnit.Core;
 using NUnit.Framework;
 
 using Org.BouncyCastle.Math;
@@ -121,5 +122,21 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
         {
             return new PgpSecretKeyRingBundle(SimpleTest.GetTestDataAsStream("openpgp.unicode." + keyName));
         }
+
+        public static void Main(string[] args)
+        {
+            Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty);
+        }
+
+        [Suite]
+        public static TestSuite Suite
+        {
+            get
+            {
+                TestSuite suite = new TestSuite("Unicode Password Tests");
+                suite.Add(new PgpUnicodeTest());
+                return suite;
+            }
+        }
     }
 }