Remove all trailing whitespace from the dalvik team-maintained parts of libcore.

Gentlemen, you may now set your editors to "strip trailing whitespace"...

Change-Id: I85b2f6c80e5fbef1af6cab11789790b078c11b1b

106 files changed, 1131 insertions, 1131 deletions

diff --git a/support/src/test/java/javax/net/ssl/TestSSLContext.java b/support/src/test/java/javax/net/ssl/TestSSLContext.java
index aef3bf5..43e085a 100644
--- a/support/src/test/java/javax/net/ssl/TestSSLContext.java
+++ b/support/src/test/java/javax/net/ssl/TestSSLContext.java
@@ -44,10 +44,10 @@ public final class TestSSLContext {
     public static final boolean IS_RI = !"Dalvik Core Library".equals(System.getProperty("java.specification.name"));
     public static final String PROVIDER_NAME = (IS_RI) ? "SunJSSE" : "HarmonyJSSE";
 
-    /* 
+    /*
      * The RI and Android have very different default SSLSession cache behaviors.
      * The RI keeps an unlimited number of SSLSesions around for 1 day.
-     * Android keeps 10 SSLSessions forever. 
+     * Android keeps 10 SSLSessions forever.
      */
     public static final int EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 10;
     public static final int EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 100;
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/CertificateStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/CertificateStub.java
index 18bc3e7..32ecd41 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/CertificateStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/CertificateStub.java
@@ -40,19 +40,19 @@ public class CertificateStub implements Certificate {
     Principal guarantor;
     Principal principal;
     PublicKey key;
-    
+
     public CertificateStub(String format, Principal guarantor, Principal principal, PublicKey key){
         this.format = format;
         this.guarantor = guarantor;
         this.principal = principal;
         this.key = key;
     }
-    
+
     /**
      * Stub - does nothing
      * @see java.security.Certificate#decode(java.io.InputStream)
      */
-    public void decode(InputStream stream) throws KeyException, 
+    public void decode(InputStream stream) throws KeyException,
             IOException {
 
 
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/IdentityScopeStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/IdentityScopeStub.java
index 65f64ac..061820c 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/IdentityScopeStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/IdentityScopeStub.java
@@ -34,7 +34,7 @@ import java.util.Enumeration;
 @SuppressWarnings("deprecation")
 public class IdentityScopeStub extends IdentityScope {
 
-    
+
     /**
      * Stub constructor
      */
@@ -66,7 +66,7 @@ public class IdentityScopeStub extends IdentityScope {
      * @see java.security.IdentityScope#size()
      */
     public int size() {
-        
+
         return 0;
     }
 
@@ -75,7 +75,7 @@ public class IdentityScopeStub extends IdentityScope {
      * @see java.security.IdentityScope#getIdentity(java.lang.String)
      */
     public Identity getIdentity(String name) {
-        
+
         return this;
     }
 
@@ -92,7 +92,7 @@ public class IdentityScopeStub extends IdentityScope {
      * @see java.security.IdentityScope#addIdentity(java.security.Identity)
      */
     public void addIdentity(Identity identity) throws KeyManagementException {
-        
+
 
     }
 
@@ -101,7 +101,7 @@ public class IdentityScopeStub extends IdentityScope {
      * @see java.security.IdentityScope#removeIdentity(java.security.Identity)
      */
     public void removeIdentity(Identity identity) throws KeyManagementException {
-        
+
 
     }
 
@@ -112,14 +112,14 @@ public class IdentityScopeStub extends IdentityScope {
     public Enumeration identities() {
         return null;
     }
-    
+
     /**
      * Sets the system's identity scope
      * @param scope
      */
     public static void mySetSystemScope(IdentityScope scope) {
-        
+
         IdentityScope.setSystemScope(scope);
     }
-    
+
 }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/IdentityStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/IdentityStub.java
index 884fbf4..520a365 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/IdentityStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/IdentityStub.java
@@ -29,7 +29,7 @@ import java.security.PublicKey;
 
 /**
  * Stub for abstract class Identity
- * 
+ *
  */
 @SuppressWarnings("deprecation")
 public class IdentityStub extends Identity {
@@ -39,22 +39,22 @@ public class IdentityStub extends Identity {
      */
     @SuppressWarnings("deprecation")
     public IdentityStub() {
-        super();        
+        super();
     }
 
     /**
      * TODO Put ctor description here
-     * 
+     *
      * @param name
      */
     @SuppressWarnings("deprecation")
     public IdentityStub(String name) {
-        super(name);        
+        super(name);
     }
 
     /**
      * TODO Put ctor description here
-     * 
+     *
      * @param name
      * @param scope
      * @throws KeyManagementException
@@ -66,7 +66,7 @@ public class IdentityStub extends Identity {
     }
 
     /**
-     * Auxiliary constructor 
+     * Auxiliary constructor
      * @param name
      * @param key
      * @throws KeyManagementException
@@ -76,7 +76,7 @@ public class IdentityStub extends Identity {
         this(name);
         setPublicKey(key);
     }
-    
+
     @SuppressWarnings("deprecation")
     public boolean identityEquals(Identity identity) {
         return super.identityEquals(identity);
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/KeyStoreTestSupport.java b/support/src/test/java/org/apache/harmony/security/tests/support/KeyStoreTestSupport.java
index 4469c8b..52bab43 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/KeyStoreTestSupport.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/KeyStoreTestSupport.java
@@ -33,7 +33,7 @@ import javax.crypto.SecretKey;
 
 /**
  * Support class for KeyStore tests
- *  
+ *
  */
 
 public class KeyStoreTestSupport {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MDGoldenData.java b/support/src/test/java/org/apache/harmony/security/tests/support/MDGoldenData.java
index ae13f59..0951f9c 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MDGoldenData.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MDGoldenData.java
@@ -29,11 +29,11 @@ import java.util.HashMap;
  * - reference message<br>
  * - reference message digests calculated using
  *   BEA JRockit j2sdk1.4.2_04 (http://www.bea.com)
- *   for various MD algorithms: 
+ *   for various MD algorithms:
  *   SHA-1, SHA-256, SHA-384, SHA-512, MD-5.
- * Standard algorithm names are defined in 
+ * Standard algorithm names are defined in
  * "JavaTM Cryptography Architecture API Specification & Reference"
- *   
+ *
  */
 public class MDGoldenData {
     // The length of test message
@@ -43,7 +43,7 @@ public class MDGoldenData {
     // Reference digests for various algorithms calculated
     // for <code>myMessage</code>
     private static final HashMap<String, byte[]> goldenData = new HashMap<String, byte[]>();
-    
+
     static {
         // fill myMessage
         for (int i=0; i<myMessage.length; i++) {
@@ -190,7 +190,7 @@ public class MDGoldenData {
      *
      * @param key
      *  MD algorithm name or MD algorithm name + "_NU" if
-     *  not updated MD value requested  
+     *  not updated MD value requested
      * @return
      *  reference digest for specified MD algorithm name
      */
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyAlgorithmParameterGeneratorSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyAlgorithmParameterGeneratorSpi.java
index ecc6899..61e7c7e 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyAlgorithmParameterGeneratorSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyAlgorithmParameterGeneratorSpi.java
@@ -30,12 +30,12 @@ import java.security.spec.AlgorithmParameterSpec;
 /**
  * Additional class for verification AlgorithmParameterGeneratorSpi and
  * AlgorithmParameterGenerator classes
- * 
+ *
  */
 
-public class MyAlgorithmParameterGeneratorSpi 
+public class MyAlgorithmParameterGeneratorSpi
         extends AlgorithmParameterGeneratorSpi {
-    
+
     public void engineInit(int keysize, SecureRandom random) {
         if (keysize < 0) {
             throw new IllegalArgumentException("keysize < 0");
@@ -48,7 +48,7 @@ public class MyAlgorithmParameterGeneratorSpi
             throw new IllegalArgumentException("random is null");
         }
     }
-    
+
     public AlgorithmParameters engineGenerateParameters() {
         return null;
     }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator1.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator1.java
index ce7cacd..83aab63 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator1.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator1.java
@@ -33,7 +33,7 @@ import java.security.spec.AlgorithmParameterSpec;
 
 /**
  * Additional class extends KeyPairGenerator
- * 
+ *
  */
 
 public class MyKeyPairGenerator1 extends KeyPairGenerator {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator2.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator2.java
index 9191e45..9b9926b 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator2.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator2.java
@@ -29,7 +29,7 @@ import java.security.SecureRandom;
 
 /**
  *  Additional class extends KeyPairGenerator
- * 
+ *
  */
 
 public class MyKeyPairGenerator2 extends KeyPairGenerator {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator3.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator3.java
index affbbd7..71e34a7 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator3.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGenerator3.java
@@ -29,7 +29,7 @@ import java.security.PublicKey;
 
 /**
  * Additional class extends KeyPairGenerator
- * 
+ *
  */
 
 public class MyKeyPairGenerator3 extends KeyPairGenerator {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGeneratorSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGeneratorSpi.java
index e26eb8c..9920c1a 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGeneratorSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyPairGeneratorSpi.java
@@ -31,7 +31,7 @@ import java.security.spec.AlgorithmParameterSpec;
 
 /**
  * Additional class for verification of KeyPairGeneratorSpi and KeyPairGenerator
- * 
+ *
  */
 
 public class MyKeyPairGeneratorSpi extends KeyPairGeneratorSpi {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStore.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStore.java
index 61c4a2f..bfdc2ca 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStore.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStore.java
@@ -40,7 +40,7 @@ import java.util.Hashtable;
 
 /**
  * Additional class for KeyStoreSpi and KeyStore verification
- * 
+ *
  */
 
 public class MyKeyStore extends KeyStoreSpi {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStoreSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStoreSpi.java
index fc58639..4ec6d9e 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStoreSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyKeyStoreSpi.java
@@ -39,7 +39,7 @@ import java.util.Enumeration;
 
 /**
  * Additional class for KeyStoreSpi and KeyStore verification
- * 
+ *
  */
 
 public class MyKeyStoreSpi extends KeyStoreSpi {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyLoadStoreParams.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyLoadStoreParams.java
index 492e99e..e703b3a 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyLoadStoreParams.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyLoadStoreParams.java
@@ -27,9 +27,9 @@ import java.security.KeyStore;
 /**
  * Additional class extends KeyStore.LoadStoreParameter
  */
-public class MyLoadStoreParams implements 
+public class MyLoadStoreParams implements
         KeyStore.LoadStoreParameter {
-    
+
     KeyStore.ProtectionParameter protPar;
 
     public MyLoadStoreParams(KeyStore.ProtectionParameter p) {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest1.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest1.java
index 2744227..f98ed39 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest1.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest1.java
@@ -26,36 +26,36 @@ import java.security.MessageDigest;
 
 /**
  * Tests implementation of MessageDigest
- * 
+ *
  */
 public class MyMessageDigest1 extends MessageDigest {
 
     public boolean runEngineReset = false;
     public boolean runEngineDigest = false;
     public boolean runEngineUpdate1 = false;
-    public boolean runEngineUpdate2 = false;    
-    
+    public boolean runEngineUpdate2 = false;
+
     public MyMessageDigest1() {
         super(null);
     }
-    
+
     /**
-     * 
+     *
      * @param algorithm
      */
     public MyMessageDigest1(String algorithm) {
         super(algorithm);
     }
-    
+
     /**
-     * 
+     *
      */
     public void engineReset() {
         runEngineReset = true;
     }
 
     /**
-     * 
+     *
      */
     public byte[] engineDigest() {
         runEngineDigest = true;
@@ -63,14 +63,14 @@ public class MyMessageDigest1 extends MessageDigest {
     }
 
     /**
-     * 
+     *
      */
     public void engineUpdate(byte arg0) {
         runEngineUpdate1 = true;
     }
 
     /**
-     * 
+     *
      */
     public void engineUpdate(byte[] arg0, int arg1, int arg2) {
         runEngineUpdate2 = true;
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest2.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest2.java
index f3b3153..b9fb959 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest2.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyMessageDigest2.java
@@ -26,24 +26,24 @@ import java.security.MessageDigestSpi;
 
 /**
  * Tests implementation of MessageDigest
- * 
+ *
  */
 public class MyMessageDigest2 extends MessageDigestSpi {
 
     public static boolean runEngineReset = false;
     public static boolean runEngineDigest = false;
     public static boolean runEngineUpdate1 = false;
-    public static boolean runEngineUpdate2 = false;            
+    public static boolean runEngineUpdate2 = false;
 
     /**
-     * 
+     *
      */
     public void engineReset() {
         runEngineReset = true;
     }
 
     /**
-     * 
+     *
      */
     public byte[] engineDigest() {
         runEngineDigest = true;
@@ -51,14 +51,14 @@ public class MyMessageDigest2 extends MessageDigestSpi {
     }
 
     /**
-     * 
+     *
      */
     public void engineUpdate(byte arg0) {
         runEngineUpdate1 = true;
     }
 
     /**
-     * 
+     *
      */
     public void engineUpdate(byte[] arg0, int arg1, int arg2) {
         runEngineUpdate2 = true;
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java
index 99c76ba..30df601 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MySSLContextSpi.java
@@ -35,13 +35,13 @@ import javax.net.ssl.TrustManager;
 /**
  * Additional class for verification of SSLContextSpi and SSLContext
  * functionality
- * 
+ *
  */
 
 public class MySSLContextSpi extends SSLContextSpi {
-    
+
     private boolean init = false;
-    
+
     protected void engineInit(KeyManager[] km, TrustManager[] tm,
             SecureRandom sr) throws KeyManagementException {
         if (sr == null) {
@@ -54,7 +54,7 @@ public class MySSLContextSpi extends SSLContextSpi {
     protected SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
-        }   
+        }
         return null;
     }
 
@@ -81,7 +81,7 @@ public class MySSLContextSpi extends SSLContextSpi {
 
     /*
      * FIXME: add these methods
-     */   
+     */
     protected SSLEngine engineCreateSSLEngine(String host, int port) {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -95,20 +95,20 @@ public class MySSLContextSpi extends SSLContextSpi {
         }
         return new tmpSSLEngine();
     }
-    
+
     public class tmpSSLEngine extends SSLEngine {
         String tmpHost;
         int tmpPort;
         public tmpSSLEngine() {
             tmpHost = null;
-            tmpPort = 0;        
+            tmpPort = 0;
         }
         public tmpSSLEngine(String host, int port) {
             tmpHost = host;
-            tmpPort = port;        
+            tmpPort = port;
         }
         public String getPeerHost() {
-            return tmpHost;        
+            return tmpHost;
         }
         public int getPeerPort() {
             return tmpPort;
@@ -134,13 +134,13 @@ public class MySSLContextSpi extends SSLContextSpi {
         public void setEnableSessionCreation(boolean flag) { }
         public void setNeedClientAuth(boolean need) { }
         public void setUseClientMode(boolean mode) { }
-        public void setWantClientAuth(boolean want) { }        
+        public void setWantClientAuth(boolean want) { }
         public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
                 int offset, int length) throws SSLException {
             return null;
-        }        
+        }
         public SSLEngineResult wrap(ByteBuffer[] srcs, int offset,
-                int length, ByteBuffer dst) throws SSLException { 
+                int length, ByteBuffer dst) throws SSLException {
             return null;
         }
     }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MySignature1.java b/support/src/test/java/org/apache/harmony/security/tests/support/MySignature1.java
index 2703b0f..c99c508 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MySignature1.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MySignature1.java
@@ -30,39 +30,39 @@ import java.security.SignatureException;
 
 /**
  * Tests implementation of Signature
- * 
+ *
  */
 public class MySignature1 extends Signature {
 
     public boolean runEngineInitVerify = false;
     public boolean runEngineInitSign = false;
     public boolean runEngineUpdate1 = false;
-    public boolean runEngineUpdate2 = false;    
+    public boolean runEngineUpdate2 = false;
     public boolean runEngineSign = false;
     public boolean runEngineVerify = false;
-    public boolean runEngineSetParameter = false;    
+    public boolean runEngineSetParameter = false;
     public boolean runEngineGetParameter = false;
-    
+
     public static int SIGN = Signature.SIGN;
     public static int VERIFY = Signature.VERIFY;
     public static int UNINITIALIZED = Signature.UNINITIALIZED;
-    private final int BUFFER_LENGTH = 10; 
+    private final int BUFFER_LENGTH = 10;
     /**
-     * 
+     *
      *
      */
     public MySignature1() {
         super(null);
     }
-    
+
     /**
-     * 
+     *
      * @param algorithm
      */
     public MySignature1(String algorithm) {
         super(algorithm);
     }
-    
+
     protected void engineInitVerify(PublicKey publicKey)
             throws InvalidKeyException {
         runEngineInitVerify = true;
@@ -110,11 +110,11 @@ public class MySignature1 extends Signature {
         runEngineGetParameter = true;
         return null;
     }
-    
+
     public int getState() {
         return state;
     }
-    
+
     public int getBufferLength() {
         return BUFFER_LENGTH;
     }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MySignature2.java b/support/src/test/java/org/apache/harmony/security/tests/support/MySignature2.java
index 838dcae..1742800 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MySignature2.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MySignature2.java
@@ -30,19 +30,19 @@ import java.security.SignatureSpi;
 
 /**
  * Tests implementation of Signature
- * 
+ *
  */
 public class MySignature2 extends SignatureSpi {
 
     public static boolean runEngineInitVerify = false;
     public static boolean runEngineInitSign = false;
     public static boolean runEngineUpdate1 = false;
-    public static boolean runEngineUpdate2 = false;    
+    public static boolean runEngineUpdate2 = false;
     public static boolean runEngineSign = false;
     public static boolean runEngineVerify = false;
-    public static boolean runEngineSetParameter = false;    
+    public static boolean runEngineSetParameter = false;
     public static boolean runEngineGetParameter = false;
-    
+
     protected void engineInitVerify(PublicKey publicKey)
             throws InvalidKeyException {
         runEngineInitVerify = true;
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/MyTrustManagerFactorySpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/MyTrustManagerFactorySpi.java
index 4c2ea8e..db9e0f8 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/MyTrustManagerFactorySpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/MyTrustManagerFactorySpi.java
@@ -26,9 +26,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactorySpi;
 
 /**
- * Class for vertifying TrustManagerFactorySpi and TrustManagerFactory 
+ * Class for vertifying TrustManagerFactorySpi and TrustManagerFactory
  * functionality
- * 
+ *
  */
 
 public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
@@ -57,8 +57,8 @@ public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
     protected TrustManager[] engineGetTrustManagers() {
         return null;
     }
-    
-    
+
+
     public static class Parameters implements ManagerFactoryParameters {
         private KeyStore keyStore;
         public Parameters (KeyStore ks) {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/PrivateKeyStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/PrivateKeyStub.java
index 9741f6d..b593cfc 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/PrivateKeyStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/PrivateKeyStub.java
@@ -31,15 +31,15 @@ import java.security.PrivateKey;
 public class PrivateKeyStub implements PrivateKey {
 
     private static final long serialVersionUID = 111111111L;
-    
+
     String algorithm = null;
     String format = null;
     byte [] encoded = null;
-    
-    
+
+
     /**
      * Constructor
-     * 
+     *
      * @param algorithm
      * @param format
      * @param encoded
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/PublicKeyStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/PublicKeyStub.java
index 8c23e19..a1644e7 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/PublicKeyStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/PublicKeyStub.java
@@ -28,7 +28,7 @@ import java.security.PublicKey;
 
 /**
  * Stub implements interface PublicKey
- * 
+ *
  */
 
 public class PublicKeyStub implements PublicKey {
@@ -38,9 +38,9 @@ public class PublicKeyStub implements PublicKey {
     String algorithm = null;
     String format = null;
     byte [] encoded = null;
-    
+
     /**
-     *  constructor 
+     *  constructor
      */
     public PublicKeyStub(String algorithm, String format, byte[] encoded) {
         this.algorithm = algorithm;
@@ -63,7 +63,7 @@ public class PublicKeyStub implements PublicKey {
         return format;
     }
 
-    /** 
+    /**
      * returns encoded
      * @see java.security.Key#getEncoded()
      */
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/RandomImpl.java b/support/src/test/java/org/apache/harmony/security/tests/support/RandomImpl.java
index d6dc9ec..f47b518 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/RandomImpl.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/RandomImpl.java
@@ -25,14 +25,14 @@ import java.security.SecureRandomSpi;
 
 /**
  * Test implementation of SecureRandom
- * 
+ *
  */
 public class RandomImpl extends SecureRandomSpi {
 
     public static boolean runEngineGenerateSeed = false;
     public static boolean runEngineNextBytes = false;
     public static boolean runEngineSetSeed = false;
-    
+
     protected void engineSetSeed(byte[] seed) {
         runEngineSetSeed = true;
     }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/SecurityChecker.java b/support/src/test/java/org/apache/harmony/security/tests/support/SecurityChecker.java
index 73f1021..2cf846a 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/SecurityChecker.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/SecurityChecker.java
@@ -50,7 +50,7 @@ public class SecurityChecker extends SecurityManager {
             }
         }
     }
-    
+
     public SecurityChecker reset() {
         checkAsserted = false;
         return this;
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/SignerStub.java b/support/src/test/java/org/apache/harmony/security/tests/support/SignerStub.java
index 3b3edcf..95a76eb 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/SignerStub.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/SignerStub.java
@@ -28,13 +28,13 @@ import java.security.Signer;
 
 /**
  * Stub for abstract class Signer, necessary for testing purposes
- * 
+ *
  */
 @SuppressWarnings("deprecation")
 public class SignerStub extends Signer {
 
     /**
-     * Default constructor 
+     * Default constructor
      */
     public SignerStub() {
         super();
@@ -42,7 +42,7 @@ public class SignerStub extends Signer {
 
     /**
      * Constructor, sets given name
-     * 
+     *
      * @param name
      */
     public SignerStub(String name) {
@@ -51,7 +51,7 @@ public class SignerStub extends Signer {
 
     /**
      * Constructor, sets given name and scope
-     * 
+     *
      * @param name
      * @param scope
      * @throws KeyManagementException
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/SpiEngUtils.java b/support/src/test/java/org/apache/harmony/security/tests/support/SpiEngUtils.java
index 9e5fd70..70045e1 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/SpiEngUtils.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/SpiEngUtils.java
@@ -27,7 +27,7 @@ import java.security.Provider;
 
 /**
  * Additional class for verification spi-engine classes
- * 
+ *
  */
 
 public class SpiEngUtils {
@@ -39,7 +39,7 @@ public class SpiEngUtils {
 
     /**
      * Verification: is algorithm supported or not
-     * 
+     *
      * @param algorithm
      * @param service
      * @return
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/TestCertUtils.java b/support/src/test/java/org/apache/harmony/security/tests/support/TestCertUtils.java
index 0054d5f..c9b9c9a 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/TestCertUtils.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/TestCertUtils.java
@@ -47,7 +47,7 @@ import javax.security.auth.x500.X500Principal;
 /**
  * The class contains various utility methods used during the java.security
  * classes testing.
- * 
+ *
  */
 
 public final class TestCertUtils {
@@ -58,7 +58,7 @@ public final class TestCertUtils {
 
     /**
      * Returns new instance of test certificate each time the method is called.
-     * 
+     *
      * @return test certificate
      */
     public static Certificate getCert() {
@@ -70,7 +70,7 @@ public final class TestCertUtils {
      * real chain of certificates, it's just an array of 3 certs. The method
      * returns new array each time it's called. The number of 3 was chosen
      * arbitrarily and is subject to change.
-     * 
+     *
      * @return an array of 3 certificates
      */
     public static Certificate[] getCertChain() {
@@ -82,7 +82,7 @@ public final class TestCertUtils {
     /**
      * Returns a test CertPath, which uses getCertChain() to obtain a list of
      * certificates to store.
-     * 
+     *
      * @return test cert path
      */
     public static CertPath getCertPath() {
@@ -91,14 +91,14 @@ public final class TestCertUtils {
 
     /**
      * Generates and returns an instance of TestCertPath.<br>
-     * TestCertificate-s included in the CertPath will be uniq (will have 
-     * different numbers passed to their ctor-s).<br> 
+     * TestCertificate-s included in the CertPath will be uniq (will have
+     * different numbers passed to their ctor-s).<br>
      * The second arguments shows which number will have the first Certificate
-     * in the CertPath. The second certificate will have (startID+1) number 
+     * in the CertPath. The second certificate will have (startID+1) number
      * and so on.
-     * 
+     *
      * @param howMany - shows how many TestCerts must contain the CertPath generated
-     * @param startID - specifies the starting ID which the first certificate will have  
+     * @param startID - specifies the starting ID which the first certificate will have
      * @return TestCertPath
      */
     public static CertPath genCertPath(int howMany, int startID) {
@@ -142,7 +142,7 @@ public final class TestCertUtils {
 
     /**
      * The class represents test certificate path.
-     * 
+     *
      */
 
     public static final class TestCertPath extends CertPath implements
@@ -156,9 +156,9 @@ public final class TestCertUtils {
         private Certificate[] certs;
 
         /**
-         * Default ctor for TestCertPath. Uses {@link TestCertUtils#getCertChain()} 
+         * Default ctor for TestCertPath. Uses {@link TestCertUtils#getCertChain()}
          * to obtain list of certificates.<br>
-         * All TestCertPath-s constructed via this ctor will be equals() to each 
+         * All TestCertPath-s constructed via this ctor will be equals() to each
          * other.
          */
         public TestCertPath() {
@@ -167,8 +167,8 @@ public final class TestCertUtils {
         }
 
         /**
-         * Constructs TestCertPath and keeps the given array of certificates.<br> 
-         * The TestCertPaths constructed via this ctor may be different (if they 
+         * Constructs TestCertPath and keeps the given array of certificates.<br>
+         * The TestCertPaths constructed via this ctor may be different (if they
          * have different set of certificates)<br>
          * @see TestCertUtils#genCertPath(int, int)
          * @param certs
@@ -178,14 +178,14 @@ public final class TestCertUtils {
             this.certs = certs;
         }
 
-        /** 
+        /**
          * @see java.security.cert.CertPath#getCertificates()
          */
         public List<Certificate> getCertificates() {
             return Arrays.asList(certs);
         }
 
-        /** 
+        /**
          * @see java.security.cert.CertPath#getEncoded()
          */
         public byte[] getEncoded() throws CertificateEncodingException {
@@ -208,7 +208,7 @@ public final class TestCertUtils {
             v.add("myTestEncoding");
             return v.iterator();
         }
-        
+
         public String toString() {
             StringBuffer buf = new StringBuffer(200);
             buf.append("TestCertPath. certs count=");
@@ -230,7 +230,7 @@ public final class TestCertUtils {
          * (String) serializedData<br>
          * (int) number of certificates in this CertPath<br>
          * <array of certificates>
-         * 
+         *
          * @param out
          * @throws IOException
          */
@@ -271,7 +271,7 @@ public final class TestCertUtils {
 
     /**
      * The class represents empty PublicKey.
-     * 
+     *
      */
 
     public static final class TestPublicKey implements PublicKey {
@@ -297,7 +297,7 @@ public final class TestCertUtils {
 
     /**
      * The class represents test certificate.
-     * 
+     *
      */
 
     public static class TestCertificate extends Certificate implements
@@ -308,7 +308,7 @@ public final class TestCertUtils {
 
         public static final String TYPE = "Test";
 
-        // 
+        //
         // A String that makes different TestCertificates to be different.
         //
         private String diff = null;
@@ -323,7 +323,7 @@ public final class TestCertUtils {
 
         /**
          * A special purpose ctor. Pass different String-s to have different TestCertificates.
-         * TestCertificate-s with the same String passed to this ctor are considered equal. 
+         * TestCertificate-s with the same String passed to this ctor are considered equal.
          */
         public TestCertificate(String diff) {
             super(TYPE);
@@ -331,9 +331,9 @@ public final class TestCertUtils {
         }
 
         /**
-         * A ctor that allows to specify both the TYPE of certificate and the 
-         * diff. Leave the <code>diff</code> null when no difference needed. 
-         * 
+         * A ctor that allows to specify both the TYPE of certificate and the
+         * diff. Leave the <code>diff</code> null when no difference needed.
+         *
          * @param diff
          * @param type
          */
@@ -384,9 +384,9 @@ public final class TestCertUtils {
 
         /**
          * Writes:<br>
-         * boolean - true if this certificate has a diff string, 
+         * boolean - true if this certificate has a diff string,
          * false otherwise, followed by <br>
-         * writeUTF() of string (if presented)  
+         * writeUTF() of string (if presented)
          *
          * @param out
          * @throws IOException
@@ -425,12 +425,12 @@ public final class TestCertUtils {
     }
 
     /**
-     * 
+     *
      * TestX509CErtificate.<br>
-     * Does nothing interesting, but<br> 
+     * Does nothing interesting, but<br>
      * a) is not abstract, so it can be instantiated<br>
      * b) returns Encoded form<br>
-     * 
+     *
      */
     public static class TestX509Certificate extends X509Certificate {
         private X500Principal subject;
@@ -452,10 +452,10 @@ public final class TestCertUtils {
 
         /**
          * The encoded for of this X509Certificate is a byte array where
-         * first are bytes of encoded form of Subject (as X500Principal), 
+         * first are bytes of encoded form of Subject (as X500Principal),
          * followed by one zero byte
          * and followed by the encoded form of Issuer (as X500Principal)
-         * 
+         *
          */
         public byte[] getEncoded() throws CertificateEncodingException {
             byte[] asubj = subject.getEncoded();
@@ -578,7 +578,7 @@ public final class TestCertUtils {
     }
 
     /**
-     * TestProvider. Does nothing, but pretends to 
+     * TestProvider. Does nothing, but pretends to
      * implement X.509 CertificateFactory.
      */
     public static class TestProvider extends Provider {
@@ -600,16 +600,16 @@ public final class TestCertUtils {
 
     /**
      * Some kind of Certificate Factory, used during unit testing.
-     * 
-     * 
+     *
+     *
      */
     public static class TestFactorySpi extends CertificateFactorySpi {
 
         /**
-         * Tries to create an instance of TestX509Certificate, basing 
-         * on the presumption that its {@link TestX509Certificate#getEncoded() 
+         * Tries to create an instance of TestX509Certificate, basing
+         * on the presumption that its {@link TestX509Certificate#getEncoded()
          * encoded} form is stored.<br>
-         * @throws CertificateException is the presumption is not met or if 
+         * @throws CertificateException is the presumption is not met or if
          * any IO problem occurs.
          */
         public Certificate engineGenerateCertificate(InputStream is)
@@ -668,7 +668,7 @@ public final class TestCertUtils {
 
         /**
          * Returns an instance of TestCertPath.<br>
-         * @throws CertificateException if 
+         * @throws CertificateException if
          * a) any of Certificates passed is not an instance of X509Certificate
          * b) any of Certificates passed is an instance of TestInvalidX509Certificate
          */
@@ -714,11 +714,11 @@ public final class TestCertUtils {
                 { null, null, null, "KO" }, { null, null, null, "TW" }, };
 
         //
-        // Returns a string from <code>data</code> from a given column and 
+        // Returns a string from <code>data</code> from a given column and
         // position. The positions are looked for first non-null entry. If there
-        // are no non empty items left, then it scans column starting from the 
+        // are no non empty items left, then it scans column starting from the
         // beginning.
-        //  
+        //
         // @param col
         // @param startRow
         // @return
@@ -730,7 +730,7 @@ public final class TestCertUtils {
                     return datas[i][col];
                 }
             }
-            // no non-null entries left, check from the beginning 
+            // no non-null entries left, check from the beginning
             for (int i = 0; i < datas.length; i++) {
                 if (datas[i][col] != null) {
                     return datas[i][col];
@@ -742,13 +742,13 @@ public final class TestCertUtils {
 
         //
         // Increments a num.<br>
-        // <code>num</code> is interpreted as a number with a base of 
-        // <code>base</code> and each digit of this number is stored as a  
+        // <code>num</code> is interpreted as a number with a base of
+        // <code>base</code> and each digit of this number is stored as a
         // separate num's element.
-        // 
+        //
         // @param num
         // @param base
-        // @return <b>true</b> if overflow happened 
+        // @return <b>true</b> if overflow happened
         //
         private static boolean inc(int[] num, int base) {
             for (int i = 0; i < num.length; i++) {
@@ -762,7 +762,7 @@ public final class TestCertUtils {
         }
 
         /**
-         * Generates some amount of uniq names, none of which is equals to 
+         * Generates some amount of uniq names, none of which is equals to
          * {@link #rootName}.
          * @param howMany
          * @return
@@ -771,7 +771,7 @@ public final class TestCertUtils {
             int counts[] = new int[datasNames.length];
             ArrayList<String> al = new ArrayList<String>();
 
-            // not really the thrifty algorithm... 
+            // not really the thrifty algorithm...
             for (int i = 0; i < howMany;) {
 
                 //                System.out.print("#"+i+": ");
@@ -811,7 +811,7 @@ public final class TestCertUtils {
         }
 
         /**
-         * Generates some amount of uniq X500Principals, none of which is equals 
+         * Generates some amount of uniq X500Principals, none of which is equals
          * has a string equals to {@link #rootName}.
          * @param howMany
          * @return
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyPair.java b/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyPair.java
index ca84dc6..67d12fc 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyPair.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyPair.java
@@ -43,406 +43,406 @@ public class TestKeyPair {
     private final KeyFactory kf;
     static {
         privateKeyEncoding.put("RSA", new byte[] {
-                (byte)0x30, (byte)0x82, (byte)0x02, (byte)0x77, 
-                (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30, 
-                (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, 
-                (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7, 
-                (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, 
-                (byte)0x05, (byte)0x00, (byte)0x04, (byte)0x82, 
-                (byte)0x02, (byte)0x61, (byte)0x30, (byte)0x82, 
-                (byte)0x02, (byte)0x5d, (byte)0x02, (byte)0x01, 
-                (byte)0x00, (byte)0x02, (byte)0x81, (byte)0x81, 
-                (byte)0x00, (byte)0xb2, (byte)0x4a, (byte)0x9b, 
-                (byte)0x5b, (byte)0xba, (byte)0x01, (byte)0xc0, 
-                (byte)0xcd, (byte)0x65, (byte)0x09, (byte)0x63, 
-                (byte)0x70, (byte)0x0b, (byte)0x5a, (byte)0x1b, 
-                (byte)0x92, (byte)0x08, (byte)0xf8, (byte)0x55, 
-                (byte)0x5e, (byte)0x7c, (byte)0x1b, (byte)0x50, 
-                (byte)0x17, (byte)0xec, (byte)0x44, (byte)0x4c, 
-                (byte)0x58, (byte)0x42, (byte)0x2b, (byte)0x41, 
-                (byte)0x09, (byte)0x59, (byte)0xf2, (byte)0xe1, 
-                (byte)0x5d, (byte)0x43, (byte)0x71, (byte)0x4d, 
-                (byte)0x92, (byte)0x03, (byte)0x1d, (byte)0xb6, 
-                (byte)0x6c, (byte)0x7f, (byte)0x5d, (byte)0x48, 
-                (byte)0xcd, (byte)0x17, (byte)0xec, (byte)0xd7, 
-                (byte)0x4c, (byte)0x39, (byte)0xb1, (byte)0x7b, 
-                (byte)0xe2, (byte)0xbf, (byte)0x96, (byte)0x77, 
-                (byte)0xbe, (byte)0xd0, (byte)0xa0, (byte)0xf0, 
-                (byte)0x2d, (byte)0x6b, (byte)0x24, (byte)0xaa, 
-                (byte)0x14, (byte)0xba, (byte)0x82, (byte)0x79, 
-                (byte)0x10, (byte)0x9b, (byte)0x16, (byte)0x68, 
-                (byte)0x47, (byte)0x81, (byte)0x54, (byte)0xa2, 
-                (byte)0xfa, (byte)0x91, (byte)0x9e, (byte)0x0a, 
-                (byte)0x2a, (byte)0x53, (byte)0xa6, (byte)0xe7, 
-                (byte)0x9e, (byte)0x7d, (byte)0x29, (byte)0x33, 
-                (byte)0xd8, (byte)0x05, (byte)0xfc, (byte)0x02, 
-                (byte)0x3f, (byte)0xbd, (byte)0xc7, (byte)0x6e, 
-                (byte)0xed, (byte)0xaa, (byte)0x30, (byte)0x6c, 
-                (byte)0x5f, (byte)0x52, (byte)0xed, (byte)0x35, 
-                (byte)0x65, (byte)0x4b, (byte)0x0e, (byte)0xc8, 
-                (byte)0xa7, (byte)0x12, (byte)0x10, (byte)0x56, 
-                (byte)0x37, (byte)0xaf, (byte)0x11, (byte)0xfa, 
-                (byte)0x21, (byte)0x0e, (byte)0x99, (byte)0xff, 
-                (byte)0xfa, (byte)0x8c, (byte)0x65, (byte)0x8e, 
-                (byte)0x6d, (byte)0x02, (byte)0x03, (byte)0x01, 
-                (byte)0x00, (byte)0x01, (byte)0x02, (byte)0x81, 
-                (byte)0x80, (byte)0x78, (byte)0x41, (byte)0x72, 
-                (byte)0x40, (byte)0x90, (byte)0x59, (byte)0x96, 
-                (byte)0x5d, (byte)0xf3, (byte)0x84, (byte)0x3d, 
-                (byte)0x99, (byte)0xd9, (byte)0x4e, (byte)0x51, 
-                (byte)0xc2, (byte)0x52, (byte)0x62, (byte)0x8d, 
-                (byte)0xd2, (byte)0x49, (byte)0x0b, (byte)0x73, 
-                (byte)0x1e, (byte)0x6f, (byte)0xb2, (byte)0x31, 
-                (byte)0x7c, (byte)0x66, (byte)0x45, (byte)0x1e, 
-                (byte)0x7c, (byte)0xdc, (byte)0x3a, (byte)0xc2, 
-                (byte)0x5f, (byte)0x51, (byte)0x9a, (byte)0x1e, 
-                (byte)0xa4, (byte)0x19, (byte)0x8d, (byte)0xf4, 
-                (byte)0xf9, (byte)0x81, (byte)0x7e, (byte)0xbe, 
-                (byte)0x17, (byte)0xf7, (byte)0xc7, (byte)0x3c, 
-                (byte)0x00, (byte)0xa1, (byte)0xf9, (byte)0x60, 
-                (byte)0x82, (byte)0x34, (byte)0x8f, (byte)0x9c, 
-                (byte)0xfd, (byte)0x0b, (byte)0x63, (byte)0x42, 
-                (byte)0x1b, (byte)0x7f, (byte)0x45, (byte)0xf1, 
-                (byte)0x31, (byte)0xc3, (byte)0x63, (byte)0x47, 
-                (byte)0x5c, (byte)0xc1, (byte)0xb2, (byte)0x5f, 
-                (byte)0x57, (byte)0xee, (byte)0x02, (byte)0x9f, 
-                (byte)0x5e, (byte)0x08, (byte)0x48, (byte)0xba, 
-                (byte)0x74, (byte)0xba, (byte)0x81, (byte)0xb7, 
-                (byte)0x30, (byte)0xac, (byte)0x4c, (byte)0x01, 
-                (byte)0x35, (byte)0xce, (byte)0x46, (byte)0x47, 
-                (byte)0x8c, (byte)0xe4, (byte)0x62, (byte)0x36, 
-                (byte)0x1a, (byte)0x65, (byte)0x0e, (byte)0x33, 
-                (byte)0x56, (byte)0xf9, (byte)0xb7, (byte)0xa0, 
-                (byte)0xc4, (byte)0xb6, (byte)0x82, (byte)0x55, 
-                (byte)0x7d, (byte)0x36, (byte)0x55, (byte)0xc0, 
-                (byte)0x52, (byte)0x5e, (byte)0x35, (byte)0x54, 
-                (byte)0xbd, (byte)0x97, (byte)0x01, (byte)0x00, 
-                (byte)0xbf, (byte)0x10, (byte)0xdc, (byte)0x1b, 
-                (byte)0x51, (byte)0x02, (byte)0x41, (byte)0x00, 
-                (byte)0xe7, (byte)0x68, (byte)0x03, (byte)0x3e, 
-                (byte)0x21, (byte)0x64, (byte)0x68, (byte)0x24, 
-                (byte)0x7b, (byte)0xd0, (byte)0x31, (byte)0xa0, 
-                (byte)0xa2, (byte)0xd9, (byte)0x87, (byte)0x6d, 
-                (byte)0x79, (byte)0x81, (byte)0x8f, (byte)0x8f, 
-                (byte)0x2d, (byte)0x7a, (byte)0x95, (byte)0x2e, 
-                (byte)0x55, (byte)0x9f, (byte)0xd7, (byte)0x86, 
-                (byte)0x29, (byte)0x93, (byte)0xbd, (byte)0x04, 
-                (byte)0x7e, (byte)0x4f, (byte)0xdb, (byte)0x56, 
-                (byte)0xf1, (byte)0x75, (byte)0xd0, (byte)0x4b, 
-                (byte)0x00, (byte)0x3a, (byte)0xe0, (byte)0x26, 
-                (byte)0xf6, (byte)0xab, (byte)0x9e, (byte)0x0b, 
-                (byte)0x2a, (byte)0xf4, (byte)0xa8, (byte)0xd7, 
-                (byte)0xff, (byte)0xbe, (byte)0x01, (byte)0xeb, 
-                (byte)0x9b, (byte)0x81, (byte)0xc7, (byte)0x5f, 
-                (byte)0x02, (byte)0x73, (byte)0xe1, (byte)0x2b, 
-                (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xc5, 
-                (byte)0x3d, (byte)0x78, (byte)0xab, (byte)0xe6, 
-                (byte)0xab, (byte)0x3e, (byte)0x29, (byte)0xfd, 
-                (byte)0x98, (byte)0xd0, (byte)0xa4, (byte)0x3e, 
-                (byte)0x58, (byte)0xee, (byte)0x48, (byte)0x45, 
-                (byte)0xa3, (byte)0x66, (byte)0xac, (byte)0xe9, 
-                (byte)0x4d, (byte)0xbd, (byte)0x60, (byte)0xea, 
-                (byte)0x24, (byte)0xff, (byte)0xed, (byte)0x0c, 
-                (byte)0x67, (byte)0xc5, (byte)0xfd, (byte)0x36, 
-                (byte)0x28, (byte)0xea, (byte)0x74, (byte)0x88, 
-                (byte)0xd1, (byte)0xd1, (byte)0xad, (byte)0x58, 
-                (byte)0xd7, (byte)0xf0, (byte)0x67, (byte)0x20, 
-                (byte)0xc1, (byte)0xe3, (byte)0xb3, (byte)0xdb, 
-                (byte)0x52, (byte)0xad, (byte)0xf3, (byte)0xc4, 
-                (byte)0x21, (byte)0xd8, (byte)0x8c, (byte)0x4c, 
-                (byte)0x41, (byte)0x27, (byte)0xdb, (byte)0xd0, 
-                (byte)0x35, (byte)0x92, (byte)0xc7, (byte)0x02, 
-                (byte)0x41, (byte)0x00, (byte)0xe0, (byte)0x99, 
-                (byte)0x42, (byte)0xb4, (byte)0x76, (byte)0x02, 
-                (byte)0x97, (byte)0x55, (byte)0xf9, (byte)0xda, 
-                (byte)0x3b, (byte)0xa0, (byte)0xd7, (byte)0x0e, 
-                (byte)0xdc, (byte)0xf4, (byte)0x33, (byte)0x7f, 
-                (byte)0xbd, (byte)0xcf, (byte)0xd0, (byte)0xeb, 
-                (byte)0x6e, (byte)0x89, (byte)0xf7, (byte)0x4f, 
-                (byte)0x5a, (byte)0x07, (byte)0x7c, (byte)0xa9, 
-                (byte)0x49, (byte)0x47, (byte)0x68, (byte)0x35, 
-                (byte)0xa8, (byte)0x05, (byte)0x3d, (byte)0xfd, 
-                (byte)0x04, (byte)0x7b, (byte)0x17, (byte)0x31, 
-                (byte)0x0d, (byte)0xc8, (byte)0xa3, (byte)0x98, 
-                (byte)0x34, (byte)0xa0, (byte)0x50, (byte)0x44, 
-                (byte)0x00, (byte)0xf1, (byte)0x0c, (byte)0xe6, 
-                (byte)0xe5, (byte)0xc4, (byte)0x41, (byte)0x3d, 
-                (byte)0xf8, (byte)0x3d, (byte)0x4e, (byte)0x0b, 
-                (byte)0x1c, (byte)0xdb, (byte)0x02, (byte)0x41, 
-                (byte)0x00, (byte)0x82, (byte)0x9b, (byte)0x8a, 
-                (byte)0xfd, (byte)0xa1, (byte)0x98, (byte)0x41, 
-                (byte)0x68, (byte)0xc2, (byte)0xd1, (byte)0xdf, 
-                (byte)0x4e, (byte)0xf3, (byte)0x2e, (byte)0x26, 
-                (byte)0x53, (byte)0x5b, (byte)0x31, (byte)0xb1, 
-                (byte)0x7a, (byte)0xcc, (byte)0x5e, (byte)0xbb, 
-                (byte)0x09, (byte)0xa2, (byte)0xe2, (byte)0x6f, 
-                (byte)0x4a, (byte)0x04, (byte)0x0d, (byte)0xef, 
-                (byte)0x90, (byte)0x15, (byte)0xbe, (byte)0x10, 
-                (byte)0x4a, (byte)0xac, (byte)0x92, (byte)0xeb, 
-                (byte)0xda, (byte)0x72, (byte)0xdb, (byte)0x43, 
-                (byte)0x08, (byte)0xb7, (byte)0x2b, (byte)0x4c, 
-                (byte)0xe1, (byte)0xbb, (byte)0x58, (byte)0xcb, 
-                (byte)0x71, (byte)0x80, (byte)0xad, (byte)0xbc, 
-                (byte)0xdc, (byte)0x62, (byte)0x5e, (byte)0x3e, 
-                (byte)0xcb, (byte)0x92, (byte)0xda, (byte)0xf6, 
-                (byte)0xdf, (byte)0x02, (byte)0x40, (byte)0x4d, 
-                (byte)0x81, (byte)0x90, (byte)0xc5, (byte)0x77, 
-                (byte)0x30, (byte)0xb7, (byte)0x29, (byte)0x00, 
-                (byte)0xa8, (byte)0xf1, (byte)0xb4, (byte)0xae, 
-                (byte)0x52, (byte)0x63, (byte)0x00, (byte)0xb2, 
-                (byte)0x2d, (byte)0x3e, (byte)0x7d, (byte)0xd6, 
-                (byte)0x4d, (byte)0xf9, (byte)0x8a, (byte)0xc1, 
-                (byte)0xb1, (byte)0x98, (byte)0x89, (byte)0x52, 
-                (byte)0x40, (byte)0x14, (byte)0x1b, (byte)0x0e, 
-                (byte)0x61, (byte)0x8f, (byte)0xf4, (byte)0xbe, 
-                (byte)0x59, (byte)0x79, (byte)0x79, (byte)0x95, 
-                (byte)0x19, (byte)0x5c, (byte)0x51, (byte)0x08, 
-                (byte)0x66, (byte)0xc1, (byte)0x42, (byte)0x30, 
-                (byte)0xb3, (byte)0x7a, (byte)0x86, (byte)0x9f, 
-                (byte)0x3e, (byte)0xf5, (byte)0x19, (byte)0xa3, 
-                (byte)0xae, (byte)0x64, (byte)0x69, (byte)0x14, 
+                (byte)0x30, (byte)0x82, (byte)0x02, (byte)0x77,
+                (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30,
+                (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a,
+                (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7,
+                (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01,
+                (byte)0x05, (byte)0x00, (byte)0x04, (byte)0x82,
+                (byte)0x02, (byte)0x61, (byte)0x30, (byte)0x82,
+                (byte)0x02, (byte)0x5d, (byte)0x02, (byte)0x01,
+                (byte)0x00, (byte)0x02, (byte)0x81, (byte)0x81,
+                (byte)0x00, (byte)0xb2, (byte)0x4a, (byte)0x9b,
+                (byte)0x5b, (byte)0xba, (byte)0x01, (byte)0xc0,
+                (byte)0xcd, (byte)0x65, (byte)0x09, (byte)0x63,
+                (byte)0x70, (byte)0x0b, (byte)0x5a, (byte)0x1b,
+                (byte)0x92, (byte)0x08, (byte)0xf8, (byte)0x55,
+                (byte)0x5e, (byte)0x7c, (byte)0x1b, (byte)0x50,
+                (byte)0x17, (byte)0xec, (byte)0x44, (byte)0x4c,
+                (byte)0x58, (byte)0x42, (byte)0x2b, (byte)0x41,
+                (byte)0x09, (byte)0x59, (byte)0xf2, (byte)0xe1,
+                (byte)0x5d, (byte)0x43, (byte)0x71, (byte)0x4d,
+                (byte)0x92, (byte)0x03, (byte)0x1d, (byte)0xb6,
+                (byte)0x6c, (byte)0x7f, (byte)0x5d, (byte)0x48,
+                (byte)0xcd, (byte)0x17, (byte)0xec, (byte)0xd7,
+                (byte)0x4c, (byte)0x39, (byte)0xb1, (byte)0x7b,
+                (byte)0xe2, (byte)0xbf, (byte)0x96, (byte)0x77,
+                (byte)0xbe, (byte)0xd0, (byte)0xa0, (byte)0xf0,
+                (byte)0x2d, (byte)0x6b, (byte)0x24, (byte)0xaa,
+                (byte)0x14, (byte)0xba, (byte)0x82, (byte)0x79,
+                (byte)0x10, (byte)0x9b, (byte)0x16, (byte)0x68,
+                (byte)0x47, (byte)0x81, (byte)0x54, (byte)0xa2,
+                (byte)0xfa, (byte)0x91, (byte)0x9e, (byte)0x0a,
+                (byte)0x2a, (byte)0x53, (byte)0xa6, (byte)0xe7,
+                (byte)0x9e, (byte)0x7d, (byte)0x29, (byte)0x33,
+                (byte)0xd8, (byte)0x05, (byte)0xfc, (byte)0x02,
+                (byte)0x3f, (byte)0xbd, (byte)0xc7, (byte)0x6e,
+                (byte)0xed, (byte)0xaa, (byte)0x30, (byte)0x6c,
+                (byte)0x5f, (byte)0x52, (byte)0xed, (byte)0x35,
+                (byte)0x65, (byte)0x4b, (byte)0x0e, (byte)0xc8,
+                (byte)0xa7, (byte)0x12, (byte)0x10, (byte)0x56,
+                (byte)0x37, (byte)0xaf, (byte)0x11, (byte)0xfa,
+                (byte)0x21, (byte)0x0e, (byte)0x99, (byte)0xff,
+                (byte)0xfa, (byte)0x8c, (byte)0x65, (byte)0x8e,
+                (byte)0x6d, (byte)0x02, (byte)0x03, (byte)0x01,
+                (byte)0x00, (byte)0x01, (byte)0x02, (byte)0x81,
+                (byte)0x80, (byte)0x78, (byte)0x41, (byte)0x72,
+                (byte)0x40, (byte)0x90, (byte)0x59, (byte)0x96,
+                (byte)0x5d, (byte)0xf3, (byte)0x84, (byte)0x3d,
+                (byte)0x99, (byte)0xd9, (byte)0x4e, (byte)0x51,
+                (byte)0xc2, (byte)0x52, (byte)0x62, (byte)0x8d,
+                (byte)0xd2, (byte)0x49, (byte)0x0b, (byte)0x73,
+                (byte)0x1e, (byte)0x6f, (byte)0xb2, (byte)0x31,
+                (byte)0x7c, (byte)0x66, (byte)0x45, (byte)0x1e,
+                (byte)0x7c, (byte)0xdc, (byte)0x3a, (byte)0xc2,
+                (byte)0x5f, (byte)0x51, (byte)0x9a, (byte)0x1e,
+                (byte)0xa4, (byte)0x19, (byte)0x8d, (byte)0xf4,
+                (byte)0xf9, (byte)0x81, (byte)0x7e, (byte)0xbe,
+                (byte)0x17, (byte)0xf7, (byte)0xc7, (byte)0x3c,
+                (byte)0x00, (byte)0xa1, (byte)0xf9, (byte)0x60,
+                (byte)0x82, (byte)0x34, (byte)0x8f, (byte)0x9c,
+                (byte)0xfd, (byte)0x0b, (byte)0x63, (byte)0x42,
+                (byte)0x1b, (byte)0x7f, (byte)0x45, (byte)0xf1,
+                (byte)0x31, (byte)0xc3, (byte)0x63, (byte)0x47,
+                (byte)0x5c, (byte)0xc1, (byte)0xb2, (byte)0x5f,
+                (byte)0x57, (byte)0xee, (byte)0x02, (byte)0x9f,
+                (byte)0x5e, (byte)0x08, (byte)0x48, (byte)0xba,
+                (byte)0x74, (byte)0xba, (byte)0x81, (byte)0xb7,
+                (byte)0x30, (byte)0xac, (byte)0x4c, (byte)0x01,
+                (byte)0x35, (byte)0xce, (byte)0x46, (byte)0x47,
+                (byte)0x8c, (byte)0xe4, (byte)0x62, (byte)0x36,
+                (byte)0x1a, (byte)0x65, (byte)0x0e, (byte)0x33,
+                (byte)0x56, (byte)0xf9, (byte)0xb7, (byte)0xa0,
+                (byte)0xc4, (byte)0xb6, (byte)0x82, (byte)0x55,
+                (byte)0x7d, (byte)0x36, (byte)0x55, (byte)0xc0,
+                (byte)0x52, (byte)0x5e, (byte)0x35, (byte)0x54,
+                (byte)0xbd, (byte)0x97, (byte)0x01, (byte)0x00,
+                (byte)0xbf, (byte)0x10, (byte)0xdc, (byte)0x1b,
+                (byte)0x51, (byte)0x02, (byte)0x41, (byte)0x00,
+                (byte)0xe7, (byte)0x68, (byte)0x03, (byte)0x3e,
+                (byte)0x21, (byte)0x64, (byte)0x68, (byte)0x24,
+                (byte)0x7b, (byte)0xd0, (byte)0x31, (byte)0xa0,
+                (byte)0xa2, (byte)0xd9, (byte)0x87, (byte)0x6d,
+                (byte)0x79, (byte)0x81, (byte)0x8f, (byte)0x8f,
+                (byte)0x2d, (byte)0x7a, (byte)0x95, (byte)0x2e,
+                (byte)0x55, (byte)0x9f, (byte)0xd7, (byte)0x86,
+                (byte)0x29, (byte)0x93, (byte)0xbd, (byte)0x04,
+                (byte)0x7e, (byte)0x4f, (byte)0xdb, (byte)0x56,
+                (byte)0xf1, (byte)0x75, (byte)0xd0, (byte)0x4b,
+                (byte)0x00, (byte)0x3a, (byte)0xe0, (byte)0x26,
+                (byte)0xf6, (byte)0xab, (byte)0x9e, (byte)0x0b,
+                (byte)0x2a, (byte)0xf4, (byte)0xa8, (byte)0xd7,
+                (byte)0xff, (byte)0xbe, (byte)0x01, (byte)0xeb,
+                (byte)0x9b, (byte)0x81, (byte)0xc7, (byte)0x5f,
+                (byte)0x02, (byte)0x73, (byte)0xe1, (byte)0x2b,
+                (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xc5,
+                (byte)0x3d, (byte)0x78, (byte)0xab, (byte)0xe6,
+                (byte)0xab, (byte)0x3e, (byte)0x29, (byte)0xfd,
+                (byte)0x98, (byte)0xd0, (byte)0xa4, (byte)0x3e,
+                (byte)0x58, (byte)0xee, (byte)0x48, (byte)0x45,
+                (byte)0xa3, (byte)0x66, (byte)0xac, (byte)0xe9,
+                (byte)0x4d, (byte)0xbd, (byte)0x60, (byte)0xea,
+                (byte)0x24, (byte)0xff, (byte)0xed, (byte)0x0c,
+                (byte)0x67, (byte)0xc5, (byte)0xfd, (byte)0x36,
+                (byte)0x28, (byte)0xea, (byte)0x74, (byte)0x88,
+                (byte)0xd1, (byte)0xd1, (byte)0xad, (byte)0x58,
+                (byte)0xd7, (byte)0xf0, (byte)0x67, (byte)0x20,
+                (byte)0xc1, (byte)0xe3, (byte)0xb3, (byte)0xdb,
+                (byte)0x52, (byte)0xad, (byte)0xf3, (byte)0xc4,
+                (byte)0x21, (byte)0xd8, (byte)0x8c, (byte)0x4c,
+                (byte)0x41, (byte)0x27, (byte)0xdb, (byte)0xd0,
+                (byte)0x35, (byte)0x92, (byte)0xc7, (byte)0x02,
+                (byte)0x41, (byte)0x00, (byte)0xe0, (byte)0x99,
+                (byte)0x42, (byte)0xb4, (byte)0x76, (byte)0x02,
+                (byte)0x97, (byte)0x55, (byte)0xf9, (byte)0xda,
+                (byte)0x3b, (byte)0xa0, (byte)0xd7, (byte)0x0e,
+                (byte)0xdc, (byte)0xf4, (byte)0x33, (byte)0x7f,
+                (byte)0xbd, (byte)0xcf, (byte)0xd0, (byte)0xeb,
+                (byte)0x6e, (byte)0x89, (byte)0xf7, (byte)0x4f,
+                (byte)0x5a, (byte)0x07, (byte)0x7c, (byte)0xa9,
+                (byte)0x49, (byte)0x47, (byte)0x68, (byte)0x35,
+                (byte)0xa8, (byte)0x05, (byte)0x3d, (byte)0xfd,
+                (byte)0x04, (byte)0x7b, (byte)0x17, (byte)0x31,
+                (byte)0x0d, (byte)0xc8, (byte)0xa3, (byte)0x98,
+                (byte)0x34, (byte)0xa0, (byte)0x50, (byte)0x44,
+                (byte)0x00, (byte)0xf1, (byte)0x0c, (byte)0xe6,
+                (byte)0xe5, (byte)0xc4, (byte)0x41, (byte)0x3d,
+                (byte)0xf8, (byte)0x3d, (byte)0x4e, (byte)0x0b,
+                (byte)0x1c, (byte)0xdb, (byte)0x02, (byte)0x41,
+                (byte)0x00, (byte)0x82, (byte)0x9b, (byte)0x8a,
+                (byte)0xfd, (byte)0xa1, (byte)0x98, (byte)0x41,
+                (byte)0x68, (byte)0xc2, (byte)0xd1, (byte)0xdf,
+                (byte)0x4e, (byte)0xf3, (byte)0x2e, (byte)0x26,
+                (byte)0x53, (byte)0x5b, (byte)0x31, (byte)0xb1,
+                (byte)0x7a, (byte)0xcc, (byte)0x5e, (byte)0xbb,
+                (byte)0x09, (byte)0xa2, (byte)0xe2, (byte)0x6f,
+                (byte)0x4a, (byte)0x04, (byte)0x0d, (byte)0xef,
+                (byte)0x90, (byte)0x15, (byte)0xbe, (byte)0x10,
+                (byte)0x4a, (byte)0xac, (byte)0x92, (byte)0xeb,
+                (byte)0xda, (byte)0x72, (byte)0xdb, (byte)0x43,
+                (byte)0x08, (byte)0xb7, (byte)0x2b, (byte)0x4c,
+                (byte)0xe1, (byte)0xbb, (byte)0x58, (byte)0xcb,
+                (byte)0x71, (byte)0x80, (byte)0xad, (byte)0xbc,
+                (byte)0xdc, (byte)0x62, (byte)0x5e, (byte)0x3e,
+                (byte)0xcb, (byte)0x92, (byte)0xda, (byte)0xf6,
+                (byte)0xdf, (byte)0x02, (byte)0x40, (byte)0x4d,
+                (byte)0x81, (byte)0x90, (byte)0xc5, (byte)0x77,
+                (byte)0x30, (byte)0xb7, (byte)0x29, (byte)0x00,
+                (byte)0xa8, (byte)0xf1, (byte)0xb4, (byte)0xae,
+                (byte)0x52, (byte)0x63, (byte)0x00, (byte)0xb2,
+                (byte)0x2d, (byte)0x3e, (byte)0x7d, (byte)0xd6,
+                (byte)0x4d, (byte)0xf9, (byte)0x8a, (byte)0xc1,
+                (byte)0xb1, (byte)0x98, (byte)0x89, (byte)0x52,
+                (byte)0x40, (byte)0x14, (byte)0x1b, (byte)0x0e,
+                (byte)0x61, (byte)0x8f, (byte)0xf4, (byte)0xbe,
+                (byte)0x59, (byte)0x79, (byte)0x79, (byte)0x95,
+                (byte)0x19, (byte)0x5c, (byte)0x51, (byte)0x08,
+                (byte)0x66, (byte)0xc1, (byte)0x42, (byte)0x30,
+                (byte)0xb3, (byte)0x7a, (byte)0x86, (byte)0x9f,
+                (byte)0x3e, (byte)0xf5, (byte)0x19, (byte)0xa3,
+                (byte)0xae, (byte)0x64, (byte)0x69, (byte)0x14,
                 (byte)0x07, (byte)0x50, (byte)0x97
-        });        
+        });
         publicKeyEncoding.put("RSA", new byte[] {
-                (byte)0x30, (byte)0x81, (byte)0x9f, (byte)0x30, 
-                (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, 
-                (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7, 
-                (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, 
-                (byte)0x05, (byte)0x00, (byte)0x03, (byte)0x81, 
-                (byte)0x8d, (byte)0x00, (byte)0x30, (byte)0x81, 
-                (byte)0x89, (byte)0x02, (byte)0x81, (byte)0x81, 
-                (byte)0x00, (byte)0xb2, (byte)0x4a, (byte)0x9b, 
-                (byte)0x5b, (byte)0xba, (byte)0x01, (byte)0xc0, 
-                (byte)0xcd, (byte)0x65, (byte)0x09, (byte)0x63, 
-                (byte)0x70, (byte)0x0b, (byte)0x5a, (byte)0x1b, 
-                (byte)0x92, (byte)0x08, (byte)0xf8, (byte)0x55, 
-                (byte)0x5e, (byte)0x7c, (byte)0x1b, (byte)0x50, 
-                (byte)0x17, (byte)0xec, (byte)0x44, (byte)0x4c, 
-                (byte)0x58, (byte)0x42, (byte)0x2b, (byte)0x41, 
-                (byte)0x09, (byte)0x59, (byte)0xf2, (byte)0xe1, 
-                (byte)0x5d, (byte)0x43, (byte)0x71, (byte)0x4d, 
-                (byte)0x92, (byte)0x03, (byte)0x1d, (byte)0xb6, 
-                (byte)0x6c, (byte)0x7f, (byte)0x5d, (byte)0x48, 
-                (byte)0xcd, (byte)0x17, (byte)0xec, (byte)0xd7, 
-                (byte)0x4c, (byte)0x39, (byte)0xb1, (byte)0x7b, 
-                (byte)0xe2, (byte)0xbf, (byte)0x96, (byte)0x77, 
-                (byte)0xbe, (byte)0xd0, (byte)0xa0, (byte)0xf0, 
-                (byte)0x2d, (byte)0x6b, (byte)0x24, (byte)0xaa, 
-                (byte)0x14, (byte)0xba, (byte)0x82, (byte)0x79, 
-                (byte)0x10, (byte)0x9b, (byte)0x16, (byte)0x68, 
-                (byte)0x47, (byte)0x81, (byte)0x54, (byte)0xa2, 
-                (byte)0xfa, (byte)0x91, (byte)0x9e, (byte)0x0a, 
-                (byte)0x2a, (byte)0x53, (byte)0xa6, (byte)0xe7, 
-                (byte)0x9e, (byte)0x7d, (byte)0x29, (byte)0x33, 
-                (byte)0xd8, (byte)0x05, (byte)0xfc, (byte)0x02, 
-                (byte)0x3f, (byte)0xbd, (byte)0xc7, (byte)0x6e, 
-                (byte)0xed, (byte)0xaa, (byte)0x30, (byte)0x6c, 
-                (byte)0x5f, (byte)0x52, (byte)0xed, (byte)0x35, 
-                (byte)0x65, (byte)0x4b, (byte)0x0e, (byte)0xc8, 
-                (byte)0xa7, (byte)0x12, (byte)0x10, (byte)0x56, 
-                (byte)0x37, (byte)0xaf, (byte)0x11, (byte)0xfa, 
-                (byte)0x21, (byte)0x0e, (byte)0x99, (byte)0xff, 
-                (byte)0xfa, (byte)0x8c, (byte)0x65, (byte)0x8e, 
-                (byte)0x6d, (byte)0x02, (byte)0x03, (byte)0x01, 
+                (byte)0x30, (byte)0x81, (byte)0x9f, (byte)0x30,
+                (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a,
+                (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7,
+                (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01,
+                (byte)0x05, (byte)0x00, (byte)0x03, (byte)0x81,
+                (byte)0x8d, (byte)0x00, (byte)0x30, (byte)0x81,
+                (byte)0x89, (byte)0x02, (byte)0x81, (byte)0x81,
+                (byte)0x00, (byte)0xb2, (byte)0x4a, (byte)0x9b,
+                (byte)0x5b, (byte)0xba, (byte)0x01, (byte)0xc0,
+                (byte)0xcd, (byte)0x65, (byte)0x09, (byte)0x63,
+                (byte)0x70, (byte)0x0b, (byte)0x5a, (byte)0x1b,
+                (byte)0x92, (byte)0x08, (byte)0xf8, (byte)0x55,
+                (byte)0x5e, (byte)0x7c, (byte)0x1b, (byte)0x50,
+                (byte)0x17, (byte)0xec, (byte)0x44, (byte)0x4c,
+                (byte)0x58, (byte)0x42, (byte)0x2b, (byte)0x41,
+                (byte)0x09, (byte)0x59, (byte)0xf2, (byte)0xe1,
+                (byte)0x5d, (byte)0x43, (byte)0x71, (byte)0x4d,
+                (byte)0x92, (byte)0x03, (byte)0x1d, (byte)0xb6,
+                (byte)0x6c, (byte)0x7f, (byte)0x5d, (byte)0x48,
+                (byte)0xcd, (byte)0x17, (byte)0xec, (byte)0xd7,
+                (byte)0x4c, (byte)0x39, (byte)0xb1, (byte)0x7b,
+                (byte)0xe2, (byte)0xbf, (byte)0x96, (byte)0x77,
+                (byte)0xbe, (byte)0xd0, (byte)0xa0, (byte)0xf0,
+                (byte)0x2d, (byte)0x6b, (byte)0x24, (byte)0xaa,
+                (byte)0x14, (byte)0xba, (byte)0x82, (byte)0x79,
+                (byte)0x10, (byte)0x9b, (byte)0x16, (byte)0x68,
+                (byte)0x47, (byte)0x81, (byte)0x54, (byte)0xa2,
+                (byte)0xfa, (byte)0x91, (byte)0x9e, (byte)0x0a,
+                (byte)0x2a, (byte)0x53, (byte)0xa6, (byte)0xe7,
+                (byte)0x9e, (byte)0x7d, (byte)0x29, (byte)0x33,
+                (byte)0xd8, (byte)0x05, (byte)0xfc, (byte)0x02,
+                (byte)0x3f, (byte)0xbd, (byte)0xc7, (byte)0x6e,
+                (byte)0xed, (byte)0xaa, (byte)0x30, (byte)0x6c,
+                (byte)0x5f, (byte)0x52, (byte)0xed, (byte)0x35,
+                (byte)0x65, (byte)0x4b, (byte)0x0e, (byte)0xc8,
+                (byte)0xa7, (byte)0x12, (byte)0x10, (byte)0x56,
+                (byte)0x37, (byte)0xaf, (byte)0x11, (byte)0xfa,
+                (byte)0x21, (byte)0x0e, (byte)0x99, (byte)0xff,
+                (byte)0xfa, (byte)0x8c, (byte)0x65, (byte)0x8e,
+                (byte)0x6d, (byte)0x02, (byte)0x03, (byte)0x01,
                 (byte)0x00, (byte)0x01
-        });        
+        });
         privateKeyEncoding.put("DSA", new byte[] {
-                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x4a, 
-                (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30, 
-                (byte)0x82, (byte)0x01, (byte)0x2b, (byte)0x06, 
-                (byte)0x07, (byte)0x2a, (byte)0x86, (byte)0x48, 
-                (byte)0xce, (byte)0x38, (byte)0x04, (byte)0x01, 
-                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x1e, 
-                (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00, 
-                (byte)0xca, (byte)0x84, (byte)0x1d, (byte)0xa3, 
-                (byte)0xab, (byte)0xb9, (byte)0x98, (byte)0xf4, 
-                (byte)0x61, (byte)0x8b, (byte)0x66, (byte)0xdb, 
-                (byte)0x4e, (byte)0x3a, (byte)0xb2, (byte)0x11, 
-                (byte)0x4e, (byte)0xa9, (byte)0xda, (byte)0x35, 
-                (byte)0x91, (byte)0xc9, (byte)0x4e, (byte)0xc3, 
-                (byte)0x16, (byte)0xa7, (byte)0xed, (byte)0xb8, 
-                (byte)0x8f, (byte)0xd7, (byte)0xea, (byte)0xea, 
-                (byte)0xdb, (byte)0x77, (byte)0xe1, (byte)0x77, 
-                (byte)0x7a, (byte)0xc9, (byte)0xf3, (byte)0x37, 
-                (byte)0x33, (byte)0x01, (byte)0x72, (byte)0xbc, 
-                (byte)0xd0, (byte)0x89, (byte)0x9b, (byte)0x18, 
-                (byte)0xfd, (byte)0x84, (byte)0xd6, (byte)0xe9, 
-                (byte)0xbf, (byte)0x13, (byte)0x35, (byte)0x5e, 
-                (byte)0x40, (byte)0xf6, (byte)0x9d, (byte)0xd9, 
-                (byte)0x1a, (byte)0xba, (byte)0xa9, (byte)0xc3, 
-                (byte)0x8c, (byte)0xe3, (byte)0x95, (byte)0xc8, 
-                (byte)0xdf, (byte)0x2e, (byte)0x41, (byte)0xa1, 
-                (byte)0xbf, (byte)0xde, (byte)0x5d, (byte)0xad, 
-                (byte)0x21, (byte)0xcc, (byte)0x0d, (byte)0x42, 
-                (byte)0x56, (byte)0xa0, (byte)0x32, (byte)0xc0, 
-                (byte)0x90, (byte)0x73, (byte)0x3e, (byte)0xa4, 
-                (byte)0x0e, (byte)0x58, (byte)0xe4, (byte)0x64, 
-                (byte)0x00, (byte)0xa3, (byte)0x27, (byte)0x49, 
-                (byte)0x56, (byte)0xb2, (byte)0x43, (byte)0xbc, 
-                (byte)0x72, (byte)0xa8, (byte)0xd2, (byte)0x26, 
-                (byte)0x89, (byte)0x35, (byte)0x37, (byte)0x29, 
-                (byte)0x8d, (byte)0x21, (byte)0xb5, (byte)0x8e, 
-                (byte)0x59, (byte)0xfa, (byte)0x9e, (byte)0xdf, 
-                (byte)0x37, (byte)0x0d, (byte)0x9e, (byte)0xab, 
-                (byte)0xfd, (byte)0xbf, (byte)0x1a, (byte)0x9e, 
-                (byte)0xf3, (byte)0xe8, (byte)0x3a, (byte)0xfb, 
-                (byte)0x02, (byte)0x15, (byte)0x00, (byte)0xa2, 
-                (byte)0x4e, (byte)0x5d, (byte)0xe3, (byte)0x10, 
-                (byte)0x5d, (byte)0xa9, (byte)0x3a, (byte)0x6a, 
-                (byte)0x4d, (byte)0x07, (byte)0x3b, (byte)0xab, 
-                (byte)0xca, (byte)0x7d, (byte)0x09, (byte)0xd6, 
-                (byte)0x06, (byte)0x79, (byte)0x49, (byte)0x02, 
-                (byte)0x81, (byte)0x80, (byte)0x5a, (byte)0x91, 
-                (byte)0x83, (byte)0x1c, (byte)0x04, (byte)0x33, 
-                (byte)0xca, (byte)0x25, (byte)0xb0, (byte)0x68, 
-                (byte)0xb3, (byte)0xb3, (byte)0xab, (byte)0x55, 
-                (byte)0x29, (byte)0x33, (byte)0x4d, (byte)0xa9, 
-                (byte)0x33, (byte)0x39, (byte)0xef, (byte)0x71, 
-                (byte)0xca, (byte)0x95, (byte)0xf3, (byte)0xd8, 
-                (byte)0x27, (byte)0x56, (byte)0x5f, (byte)0x42, 
-                (byte)0xda, (byte)0x36, (byte)0x83, (byte)0xc5, 
-                (byte)0xf1, (byte)0x53, (byte)0x62, (byte)0xa5, 
-                (byte)0xdc, (byte)0xe6, (byte)0x4e, (byte)0x69, 
-                (byte)0x45, (byte)0x71, (byte)0x1a, (byte)0x4a, 
-                (byte)0xc3, (byte)0xf4, (byte)0x7f, (byte)0x0a, 
-                (byte)0xd1, (byte)0x78, (byte)0xed, (byte)0xbe, 
-                (byte)0x6e, (byte)0xa6, (byte)0x36, (byte)0x34, 
-                (byte)0x4e, (byte)0xc3, (byte)0x1b, (byte)0x17, 
-                (byte)0xaa, (byte)0xa4, (byte)0x76, (byte)0x44, 
-                (byte)0x46, (byte)0xaf, (byte)0x26, (byte)0x16, 
-                (byte)0x14, (byte)0xfb, (byte)0x9f, (byte)0x5d, 
-                (byte)0x08, (byte)0xaf, (byte)0x92, (byte)0xdb, 
-                (byte)0xba, (byte)0xd0, (byte)0xcb, (byte)0x8b, 
-                (byte)0x1e, (byte)0xc3, (byte)0x8b, (byte)0x36, 
-                (byte)0x3b, (byte)0x4c, (byte)0x02, (byte)0xc3, 
-                (byte)0x66, (byte)0x28, (byte)0x69, (byte)0xd0, 
-                (byte)0x74, (byte)0x4f, (byte)0x1c, (byte)0x4f, 
-                (byte)0x97, (byte)0x75, (byte)0x7f, (byte)0x9e, 
-                (byte)0x89, (byte)0x80, (byte)0xcf, (byte)0xb2, 
-                (byte)0x17, (byte)0xd6, (byte)0x66, (byte)0x91, 
-                (byte)0x12, (byte)0x3a, (byte)0xb0, (byte)0x3c, 
-                (byte)0x3c, (byte)0xc2, (byte)0x31, (byte)0xd1, 
-                (byte)0x31, (byte)0x2a, (byte)0x35, (byte)0xbe, 
-                (byte)0x9d, (byte)0x54, (byte)0x71, (byte)0x03, 
-                (byte)0xcb, (byte)0xcc, (byte)0x04, (byte)0x16, 
-                (byte)0x02, (byte)0x14, (byte)0x52, (byte)0xfb, 
-                (byte)0xf9, (byte)0x12, (byte)0x40, (byte)0x05, 
-                (byte)0x59, (byte)0x8f, (byte)0xde, (byte)0x9d, 
-                (byte)0xac, (byte)0xa1, (byte)0xe2, (byte)0xed, 
-                (byte)0x56, (byte)0x62, (byte)0x5f, (byte)0x56, 
+                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x4a,
+                (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30,
+                (byte)0x82, (byte)0x01, (byte)0x2b, (byte)0x06,
+                (byte)0x07, (byte)0x2a, (byte)0x86, (byte)0x48,
+                (byte)0xce, (byte)0x38, (byte)0x04, (byte)0x01,
+                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x1e,
+                (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00,
+                (byte)0xca, (byte)0x84, (byte)0x1d, (byte)0xa3,
+                (byte)0xab, (byte)0xb9, (byte)0x98, (byte)0xf4,
+                (byte)0x61, (byte)0x8b, (byte)0x66, (byte)0xdb,
+                (byte)0x4e, (byte)0x3a, (byte)0xb2, (byte)0x11,
+                (byte)0x4e, (byte)0xa9, (byte)0xda, (byte)0x35,
+                (byte)0x91, (byte)0xc9, (byte)0x4e, (byte)0xc3,
+                (byte)0x16, (byte)0xa7, (byte)0xed, (byte)0xb8,
+                (byte)0x8f, (byte)0xd7, (byte)0xea, (byte)0xea,
+                (byte)0xdb, (byte)0x77, (byte)0xe1, (byte)0x77,
+                (byte)0x7a, (byte)0xc9, (byte)0xf3, (byte)0x37,
+                (byte)0x33, (byte)0x01, (byte)0x72, (byte)0xbc,
+                (byte)0xd0, (byte)0x89, (byte)0x9b, (byte)0x18,
+                (byte)0xfd, (byte)0x84, (byte)0xd6, (byte)0xe9,
+                (byte)0xbf, (byte)0x13, (byte)0x35, (byte)0x5e,
+                (byte)0x40, (byte)0xf6, (byte)0x9d, (byte)0xd9,
+                (byte)0x1a, (byte)0xba, (byte)0xa9, (byte)0xc3,
+                (byte)0x8c, (byte)0xe3, (byte)0x95, (byte)0xc8,
+                (byte)0xdf, (byte)0x2e, (byte)0x41, (byte)0xa1,
+                (byte)0xbf, (byte)0xde, (byte)0x5d, (byte)0xad,
+                (byte)0x21, (byte)0xcc, (byte)0x0d, (byte)0x42,
+                (byte)0x56, (byte)0xa0, (byte)0x32, (byte)0xc0,
+                (byte)0x90, (byte)0x73, (byte)0x3e, (byte)0xa4,
+                (byte)0x0e, (byte)0x58, (byte)0xe4, (byte)0x64,
+                (byte)0x00, (byte)0xa3, (byte)0x27, (byte)0x49,
+                (byte)0x56, (byte)0xb2, (byte)0x43, (byte)0xbc,
+                (byte)0x72, (byte)0xa8, (byte)0xd2, (byte)0x26,
+                (byte)0x89, (byte)0x35, (byte)0x37, (byte)0x29,
+                (byte)0x8d, (byte)0x21, (byte)0xb5, (byte)0x8e,
+                (byte)0x59, (byte)0xfa, (byte)0x9e, (byte)0xdf,
+                (byte)0x37, (byte)0x0d, (byte)0x9e, (byte)0xab,
+                (byte)0xfd, (byte)0xbf, (byte)0x1a, (byte)0x9e,
+                (byte)0xf3, (byte)0xe8, (byte)0x3a, (byte)0xfb,
+                (byte)0x02, (byte)0x15, (byte)0x00, (byte)0xa2,
+                (byte)0x4e, (byte)0x5d, (byte)0xe3, (byte)0x10,
+                (byte)0x5d, (byte)0xa9, (byte)0x3a, (byte)0x6a,
+                (byte)0x4d, (byte)0x07, (byte)0x3b, (byte)0xab,
+                (byte)0xca, (byte)0x7d, (byte)0x09, (byte)0xd6,
+                (byte)0x06, (byte)0x79, (byte)0x49, (byte)0x02,
+                (byte)0x81, (byte)0x80, (byte)0x5a, (byte)0x91,
+                (byte)0x83, (byte)0x1c, (byte)0x04, (byte)0x33,
+                (byte)0xca, (byte)0x25, (byte)0xb0, (byte)0x68,
+                (byte)0xb3, (byte)0xb3, (byte)0xab, (byte)0x55,
+                (byte)0x29, (byte)0x33, (byte)0x4d, (byte)0xa9,
+                (byte)0x33, (byte)0x39, (byte)0xef, (byte)0x71,
+                (byte)0xca, (byte)0x95, (byte)0xf3, (byte)0xd8,
+                (byte)0x27, (byte)0x56, (byte)0x5f, (byte)0x42,
+                (byte)0xda, (byte)0x36, (byte)0x83, (byte)0xc5,
+                (byte)0xf1, (byte)0x53, (byte)0x62, (byte)0xa5,
+                (byte)0xdc, (byte)0xe6, (byte)0x4e, (byte)0x69,
+                (byte)0x45, (byte)0x71, (byte)0x1a, (byte)0x4a,
+                (byte)0xc3, (byte)0xf4, (byte)0x7f, (byte)0x0a,
+                (byte)0xd1, (byte)0x78, (byte)0xed, (byte)0xbe,
+                (byte)0x6e, (byte)0xa6, (byte)0x36, (byte)0x34,
+                (byte)0x4e, (byte)0xc3, (byte)0x1b, (byte)0x17,
+                (byte)0xaa, (byte)0xa4, (byte)0x76, (byte)0x44,
+                (byte)0x46, (byte)0xaf, (byte)0x26, (byte)0x16,
+                (byte)0x14, (byte)0xfb, (byte)0x9f, (byte)0x5d,
+                (byte)0x08, (byte)0xaf, (byte)0x92, (byte)0xdb,
+                (byte)0xba, (byte)0xd0, (byte)0xcb, (byte)0x8b,
+                (byte)0x1e, (byte)0xc3, (byte)0x8b, (byte)0x36,
+                (byte)0x3b, (byte)0x4c, (byte)0x02, (byte)0xc3,
+                (byte)0x66, (byte)0x28, (byte)0x69, (byte)0xd0,
+                (byte)0x74, (byte)0x4f, (byte)0x1c, (byte)0x4f,
+                (byte)0x97, (byte)0x75, (byte)0x7f, (byte)0x9e,
+                (byte)0x89, (byte)0x80, (byte)0xcf, (byte)0xb2,
+                (byte)0x17, (byte)0xd6, (byte)0x66, (byte)0x91,
+                (byte)0x12, (byte)0x3a, (byte)0xb0, (byte)0x3c,
+                (byte)0x3c, (byte)0xc2, (byte)0x31, (byte)0xd1,
+                (byte)0x31, (byte)0x2a, (byte)0x35, (byte)0xbe,
+                (byte)0x9d, (byte)0x54, (byte)0x71, (byte)0x03,
+                (byte)0xcb, (byte)0xcc, (byte)0x04, (byte)0x16,
+                (byte)0x02, (byte)0x14, (byte)0x52, (byte)0xfb,
+                (byte)0xf9, (byte)0x12, (byte)0x40, (byte)0x05,
+                (byte)0x59, (byte)0x8f, (byte)0xde, (byte)0x9d,
+                (byte)0xac, (byte)0xa1, (byte)0xe2, (byte)0xed,
+                (byte)0x56, (byte)0x62, (byte)0x5f, (byte)0x56,
                 (byte)0x67, (byte)0x74
         });
         publicKeyEncoding.put("DSA", new byte[] {
-                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0xb7, 
-                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x2b, 
-                (byte)0x06, (byte)0x07, (byte)0x2a, (byte)0x86, 
-                (byte)0x48, (byte)0xce, (byte)0x38, (byte)0x04, 
-                (byte)0x01, (byte)0x30, (byte)0x82, (byte)0x01, 
-                (byte)0x1e, (byte)0x02, (byte)0x81, (byte)0x81, 
-                (byte)0x00, (byte)0xca, (byte)0x84, (byte)0x1d, 
-                (byte)0xa3, (byte)0xab, (byte)0xb9, (byte)0x98, 
-                (byte)0xf4, (byte)0x61, (byte)0x8b, (byte)0x66, 
-                (byte)0xdb, (byte)0x4e, (byte)0x3a, (byte)0xb2, 
-                (byte)0x11, (byte)0x4e, (byte)0xa9, (byte)0xda, 
-                (byte)0x35, (byte)0x91, (byte)0xc9, (byte)0x4e, 
-                (byte)0xc3, (byte)0x16, (byte)0xa7, (byte)0xed, 
-                (byte)0xb8, (byte)0x8f, (byte)0xd7, (byte)0xea, 
-                (byte)0xea, (byte)0xdb, (byte)0x77, (byte)0xe1, 
-                (byte)0x77, (byte)0x7a, (byte)0xc9, (byte)0xf3, 
-                (byte)0x37, (byte)0x33, (byte)0x01, (byte)0x72, 
-                (byte)0xbc, (byte)0xd0, (byte)0x89, (byte)0x9b, 
-                (byte)0x18, (byte)0xfd, (byte)0x84, (byte)0xd6, 
-                (byte)0xe9, (byte)0xbf, (byte)0x13, (byte)0x35, 
-                (byte)0x5e, (byte)0x40, (byte)0xf6, (byte)0x9d, 
-                (byte)0xd9, (byte)0x1a, (byte)0xba, (byte)0xa9, 
-                (byte)0xc3, (byte)0x8c, (byte)0xe3, (byte)0x95, 
-                (byte)0xc8, (byte)0xdf, (byte)0x2e, (byte)0x41, 
-                (byte)0xa1, (byte)0xbf, (byte)0xde, (byte)0x5d, 
-                (byte)0xad, (byte)0x21, (byte)0xcc, (byte)0x0d, 
-                (byte)0x42, (byte)0x56, (byte)0xa0, (byte)0x32, 
-                (byte)0xc0, (byte)0x90, (byte)0x73, (byte)0x3e, 
-                (byte)0xa4, (byte)0x0e, (byte)0x58, (byte)0xe4, 
-                (byte)0x64, (byte)0x00, (byte)0xa3, (byte)0x27, 
-                (byte)0x49, (byte)0x56, (byte)0xb2, (byte)0x43, 
-                (byte)0xbc, (byte)0x72, (byte)0xa8, (byte)0xd2, 
-                (byte)0x26, (byte)0x89, (byte)0x35, (byte)0x37, 
-                (byte)0x29, (byte)0x8d, (byte)0x21, (byte)0xb5, 
-                (byte)0x8e, (byte)0x59, (byte)0xfa, (byte)0x9e, 
-                (byte)0xdf, (byte)0x37, (byte)0x0d, (byte)0x9e, 
-                (byte)0xab, (byte)0xfd, (byte)0xbf, (byte)0x1a, 
-                (byte)0x9e, (byte)0xf3, (byte)0xe8, (byte)0x3a, 
-                (byte)0xfb, (byte)0x02, (byte)0x15, (byte)0x00, 
-                (byte)0xa2, (byte)0x4e, (byte)0x5d, (byte)0xe3, 
-                (byte)0x10, (byte)0x5d, (byte)0xa9, (byte)0x3a, 
-                (byte)0x6a, (byte)0x4d, (byte)0x07, (byte)0x3b, 
-                (byte)0xab, (byte)0xca, (byte)0x7d, (byte)0x09, 
-                (byte)0xd6, (byte)0x06, (byte)0x79, (byte)0x49, 
-                (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x5a, 
-                (byte)0x91, (byte)0x83, (byte)0x1c, (byte)0x04, 
-                (byte)0x33, (byte)0xca, (byte)0x25, (byte)0xb0, 
-                (byte)0x68, (byte)0xb3, (byte)0xb3, (byte)0xab, 
-                (byte)0x55, (byte)0x29, (byte)0x33, (byte)0x4d, 
-                (byte)0xa9, (byte)0x33, (byte)0x39, (byte)0xef, 
-                (byte)0x71, (byte)0xca, (byte)0x95, (byte)0xf3, 
-                (byte)0xd8, (byte)0x27, (byte)0x56, (byte)0x5f, 
-                (byte)0x42, (byte)0xda, (byte)0x36, (byte)0x83, 
-                (byte)0xc5, (byte)0xf1, (byte)0x53, (byte)0x62, 
-                (byte)0xa5, (byte)0xdc, (byte)0xe6, (byte)0x4e, 
-                (byte)0x69, (byte)0x45, (byte)0x71, (byte)0x1a, 
-                (byte)0x4a, (byte)0xc3, (byte)0xf4, (byte)0x7f, 
-                (byte)0x0a, (byte)0xd1, (byte)0x78, (byte)0xed, 
-                (byte)0xbe, (byte)0x6e, (byte)0xa6, (byte)0x36, 
-                (byte)0x34, (byte)0x4e, (byte)0xc3, (byte)0x1b, 
-                (byte)0x17, (byte)0xaa, (byte)0xa4, (byte)0x76, 
-                (byte)0x44, (byte)0x46, (byte)0xaf, (byte)0x26, 
-                (byte)0x16, (byte)0x14, (byte)0xfb, (byte)0x9f, 
-                (byte)0x5d, (byte)0x08, (byte)0xaf, (byte)0x92, 
-                (byte)0xdb, (byte)0xba, (byte)0xd0, (byte)0xcb, 
-                (byte)0x8b, (byte)0x1e, (byte)0xc3, (byte)0x8b, 
-                (byte)0x36, (byte)0x3b, (byte)0x4c, (byte)0x02, 
-                (byte)0xc3, (byte)0x66, (byte)0x28, (byte)0x69, 
-                (byte)0xd0, (byte)0x74, (byte)0x4f, (byte)0x1c, 
-                (byte)0x4f, (byte)0x97, (byte)0x75, (byte)0x7f, 
-                (byte)0x9e, (byte)0x89, (byte)0x80, (byte)0xcf, 
-                (byte)0xb2, (byte)0x17, (byte)0xd6, (byte)0x66, 
-                (byte)0x91, (byte)0x12, (byte)0x3a, (byte)0xb0, 
-                (byte)0x3c, (byte)0x3c, (byte)0xc2, (byte)0x31, 
-                (byte)0xd1, (byte)0x31, (byte)0x2a, (byte)0x35, 
-                (byte)0xbe, (byte)0x9d, (byte)0x54, (byte)0x71, 
-                (byte)0x03, (byte)0xcb, (byte)0xcc, (byte)0x03, 
-                (byte)0x81, (byte)0x85, (byte)0x00, (byte)0x02, 
-                (byte)0x81, (byte)0x81, (byte)0x00, (byte)0x95, 
-                (byte)0xcc, (byte)0x11, (byte)0xd4, (byte)0x53, 
-                (byte)0x3d, (byte)0x9c, (byte)0x5c, (byte)0x73, 
-                (byte)0xf4, (byte)0x70, (byte)0xf0, (byte)0xe1, 
-                (byte)0xac, (byte)0xe3, (byte)0x2c, (byte)0x32, 
-                (byte)0x16, (byte)0x1d, (byte)0x34, (byte)0x1a, 
-                (byte)0x38, (byte)0x63, (byte)0x69, (byte)0x1a, 
-                (byte)0x72, (byte)0x39, (byte)0x4e, (byte)0x41, 
-                (byte)0x50, (byte)0xfa, (byte)0xdc, (byte)0x78, 
-                (byte)0xa4, (byte)0xb8, (byte)0x17, (byte)0x5a, 
-                (byte)0xe4, (byte)0xf9, (byte)0xa2, (byte)0x52, 
-                (byte)0x41, (byte)0x85, (byte)0xab, (byte)0x3f, 
-                (byte)0xf4, (byte)0x73, (byte)0x2e, (byte)0xae, 
-                (byte)0xa9, (byte)0x21, (byte)0x8b, (byte)0x5e, 
-                (byte)0x95, (byte)0x15, (byte)0xa2, (byte)0x86, 
-                (byte)0x63, (byte)0x0d, (byte)0xba, (byte)0x01, 
-                (byte)0xcb, (byte)0xe3, (byte)0x68, (byte)0xc6, 
-                (byte)0xaf, (byte)0x56, (byte)0x51, (byte)0x7b, 
-                (byte)0xa8, (byte)0x85, (byte)0x3f, (byte)0x01, 
-                (byte)0x80, (byte)0x8b, (byte)0x1f, (byte)0xb4, 
-                (byte)0x4c, (byte)0x93, (byte)0x6b, (byte)0x42, 
-                (byte)0xa6, (byte)0xbd, (byte)0x67, (byte)0x2a, 
-                (byte)0x95, (byte)0x05, (byte)0xff, (byte)0x03, 
-                (byte)0x2e, (byte)0x6f, (byte)0xd4, (byte)0xd3, 
-                (byte)0xf0, (byte)0x17, (byte)0xde, (byte)0xcb, 
-                (byte)0x7d, (byte)0xd9, (byte)0x42, (byte)0x4d, 
-                (byte)0x97, (byte)0x2c, (byte)0x53, (byte)0xe6, 
-                (byte)0x39, (byte)0x61, (byte)0xd2, (byte)0x69, 
-                (byte)0xd1, (byte)0x1c, (byte)0x9a, (byte)0x8b, 
-                (byte)0x5b, (byte)0x9c, (byte)0xfa, (byte)0xfa, 
-                (byte)0x50, (byte)0x50, (byte)0xbb, (byte)0xe4, 
-                (byte)0x2e, (byte)0x83, (byte)0x06, (byte)0x08, 
+                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0xb7,
+                (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x2b,
+                (byte)0x06, (byte)0x07, (byte)0x2a, (byte)0x86,
+                (byte)0x48, (byte)0xce, (byte)0x38, (byte)0x04,
+                (byte)0x01, (byte)0x30, (byte)0x82, (byte)0x01,
+                (byte)0x1e, (byte)0x02, (byte)0x81, (byte)0x81,
+                (byte)0x00, (byte)0xca, (byte)0x84, (byte)0x1d,
+                (byte)0xa3, (byte)0xab, (byte)0xb9, (byte)0x98,
+                (byte)0xf4, (byte)0x61, (byte)0x8b, (byte)0x66,
+                (byte)0xdb, (byte)0x4e, (byte)0x3a, (byte)0xb2,
+                (byte)0x11, (byte)0x4e, (byte)0xa9, (byte)0xda,
+                (byte)0x35, (byte)0x91, (byte)0xc9, (byte)0x4e,
+                (byte)0xc3, (byte)0x16, (byte)0xa7, (byte)0xed,
+                (byte)0xb8, (byte)0x8f, (byte)0xd7, (byte)0xea,
+                (byte)0xea, (byte)0xdb, (byte)0x77, (byte)0xe1,
+                (byte)0x77, (byte)0x7a, (byte)0xc9, (byte)0xf3,
+                (byte)0x37, (byte)0x33, (byte)0x01, (byte)0x72,
+                (byte)0xbc, (byte)0xd0, (byte)0x89, (byte)0x9b,
+                (byte)0x18, (byte)0xfd, (byte)0x84, (byte)0xd6,
+                (byte)0xe9, (byte)0xbf, (byte)0x13, (byte)0x35,
+                (byte)0x5e, (byte)0x40, (byte)0xf6, (byte)0x9d,
+                (byte)0xd9, (byte)0x1a, (byte)0xba, (byte)0xa9,
+                (byte)0xc3, (byte)0x8c, (byte)0xe3, (byte)0x95,
+                (byte)0xc8, (byte)0xdf, (byte)0x2e, (byte)0x41,
+                (byte)0xa1, (byte)0xbf, (byte)0xde, (byte)0x5d,
+                (byte)0xad, (byte)0x21, (byte)0xcc, (byte)0x0d,
+                (byte)0x42, (byte)0x56, (byte)0xa0, (byte)0x32,
+                (byte)0xc0, (byte)0x90, (byte)0x73, (byte)0x3e,
+                (byte)0xa4, (byte)0x0e, (byte)0x58, (byte)0xe4,
+                (byte)0x64, (byte)0x00, (byte)0xa3, (byte)0x27,
+                (byte)0x49, (byte)0x56, (byte)0xb2, (byte)0x43,
+                (byte)0xbc, (byte)0x72, (byte)0xa8, (byte)0xd2,
+                (byte)0x26, (byte)0x89, (byte)0x35, (byte)0x37,
+                (byte)0x29, (byte)0x8d, (byte)0x21, (byte)0xb5,
+                (byte)0x8e, (byte)0x59, (byte)0xfa, (byte)0x9e,
+                (byte)0xdf, (byte)0x37, (byte)0x0d, (byte)0x9e,
+                (byte)0xab, (byte)0xfd, (byte)0xbf, (byte)0x1a,
+                (byte)0x9e, (byte)0xf3, (byte)0xe8, (byte)0x3a,
+                (byte)0xfb, (byte)0x02, (byte)0x15, (byte)0x00,
+                (byte)0xa2, (byte)0x4e, (byte)0x5d, (byte)0xe3,
+                (byte)0x10, (byte)0x5d, (byte)0xa9, (byte)0x3a,
+                (byte)0x6a, (byte)0x4d, (byte)0x07, (byte)0x3b,
+                (byte)0xab, (byte)0xca, (byte)0x7d, (byte)0x09,
+                (byte)0xd6, (byte)0x06, (byte)0x79, (byte)0x49,
+                (byte)0x02, (byte)0x81, (byte)0x80, (byte)0x5a,
+                (byte)0x91, (byte)0x83, (byte)0x1c, (byte)0x04,
+                (byte)0x33, (byte)0xca, (byte)0x25, (byte)0xb0,
+                (byte)0x68, (byte)0xb3, (byte)0xb3, (byte)0xab,
+                (byte)0x55, (byte)0x29, (byte)0x33, (byte)0x4d,
+                (byte)0xa9, (byte)0x33, (byte)0x39, (byte)0xef,
+                (byte)0x71, (byte)0xca, (byte)0x95, (byte)0xf3,
+                (byte)0xd8, (byte)0x27, (byte)0x56, (byte)0x5f,
+                (byte)0x42, (byte)0xda, (byte)0x36, (byte)0x83,
+                (byte)0xc5, (byte)0xf1, (byte)0x53, (byte)0x62,
+                (byte)0xa5, (byte)0xdc, (byte)0xe6, (byte)0x4e,
+                (byte)0x69, (byte)0x45, (byte)0x71, (byte)0x1a,
+                (byte)0x4a, (byte)0xc3, (byte)0xf4, (byte)0x7f,
+                (byte)0x0a, (byte)0xd1, (byte)0x78, (byte)0xed,
+                (byte)0xbe, (byte)0x6e, (byte)0xa6, (byte)0x36,
+                (byte)0x34, (byte)0x4e, (byte)0xc3, (byte)0x1b,
+                (byte)0x17, (byte)0xaa, (byte)0xa4, (byte)0x76,
+                (byte)0x44, (byte)0x46, (byte)0xaf, (byte)0x26,
+                (byte)0x16, (byte)0x14, (byte)0xfb, (byte)0x9f,
+                (byte)0x5d, (byte)0x08, (byte)0xaf, (byte)0x92,
+                (byte)0xdb, (byte)0xba, (byte)0xd0, (byte)0xcb,
+                (byte)0x8b, (byte)0x1e, (byte)0xc3, (byte)0x8b,
+                (byte)0x36, (byte)0x3b, (byte)0x4c, (byte)0x02,
+                (byte)0xc3, (byte)0x66, (byte)0x28, (byte)0x69,
+                (byte)0xd0, (byte)0x74, (byte)0x4f, (byte)0x1c,
+                (byte)0x4f, (byte)0x97, (byte)0x75, (byte)0x7f,
+                (byte)0x9e, (byte)0x89, (byte)0x80, (byte)0xcf,
+                (byte)0xb2, (byte)0x17, (byte)0xd6, (byte)0x66,
+                (byte)0x91, (byte)0x12, (byte)0x3a, (byte)0xb0,
+                (byte)0x3c, (byte)0x3c, (byte)0xc2, (byte)0x31,
+                (byte)0xd1, (byte)0x31, (byte)0x2a, (byte)0x35,
+                (byte)0xbe, (byte)0x9d, (byte)0x54, (byte)0x71,
+                (byte)0x03, (byte)0xcb, (byte)0xcc, (byte)0x03,
+                (byte)0x81, (byte)0x85, (byte)0x00, (byte)0x02,
+                (byte)0x81, (byte)0x81, (byte)0x00, (byte)0x95,
+                (byte)0xcc, (byte)0x11, (byte)0xd4, (byte)0x53,
+                (byte)0x3d, (byte)0x9c, (byte)0x5c, (byte)0x73,
+                (byte)0xf4, (byte)0x70, (byte)0xf0, (byte)0xe1,
+                (byte)0xac, (byte)0xe3, (byte)0x2c, (byte)0x32,
+                (byte)0x16, (byte)0x1d, (byte)0x34, (byte)0x1a,
+                (byte)0x38, (byte)0x63, (byte)0x69, (byte)0x1a,
+                (byte)0x72, (byte)0x39, (byte)0x4e, (byte)0x41,
+                (byte)0x50, (byte)0xfa, (byte)0xdc, (byte)0x78,
+                (byte)0xa4, (byte)0xb8, (byte)0x17, (byte)0x5a,
+                (byte)0xe4, (byte)0xf9, (byte)0xa2, (byte)0x52,
+                (byte)0x41, (byte)0x85, (byte)0xab, (byte)0x3f,
+                (byte)0xf4, (byte)0x73, (byte)0x2e, (byte)0xae,
+                (byte)0xa9, (byte)0x21, (byte)0x8b, (byte)0x5e,
+                (byte)0x95, (byte)0x15, (byte)0xa2, (byte)0x86,
+                (byte)0x63, (byte)0x0d, (byte)0xba, (byte)0x01,
+                (byte)0xcb, (byte)0xe3, (byte)0x68, (byte)0xc6,
+                (byte)0xaf, (byte)0x56, (byte)0x51, (byte)0x7b,
+                (byte)0xa8, (byte)0x85, (byte)0x3f, (byte)0x01,
+                (byte)0x80, (byte)0x8b, (byte)0x1f, (byte)0xb4,
+                (byte)0x4c, (byte)0x93, (byte)0x6b, (byte)0x42,
+                (byte)0xa6, (byte)0xbd, (byte)0x67, (byte)0x2a,
+                (byte)0x95, (byte)0x05, (byte)0xff, (byte)0x03,
+                (byte)0x2e, (byte)0x6f, (byte)0xd4, (byte)0xd3,
+                (byte)0xf0, (byte)0x17, (byte)0xde, (byte)0xcb,
+                (byte)0x7d, (byte)0xd9, (byte)0x42, (byte)0x4d,
+                (byte)0x97, (byte)0x2c, (byte)0x53, (byte)0xe6,
+                (byte)0x39, (byte)0x61, (byte)0xd2, (byte)0x69,
+                (byte)0xd1, (byte)0x1c, (byte)0x9a, (byte)0x8b,
+                (byte)0x5b, (byte)0x9c, (byte)0xfa, (byte)0xfa,
+                (byte)0x50, (byte)0x50, (byte)0xbb, (byte)0xe4,
+                (byte)0x2e, (byte)0x83, (byte)0x06, (byte)0x08,
                 (byte)0x96, (byte)0x2a, (byte)0x68
         });
         privateKeyEncoding.put("DH", new byte[] {
@@ -507,9 +507,9 @@ public class TestKeyPair {
                 (byte) 0x48, (byte) 0x40, (byte) 0xffffffd6, (byte) 0xffffffa2,
                 (byte) 0x0, (byte) 0xffffff85, (byte) 0xffffffe9,
                 (byte) 0xffffffc4, (byte) 0x77, (byte) 0xffffffb2, (byte) 0x25,
-                (byte) 0xffffffd8 
+                (byte) 0xffffffd8
         });
-        publicKeyEncoding.put("DH", new byte[] { 
+        publicKeyEncoding.put("DH", new byte[] {
                 (byte) 0x30, (byte) 0xffffff81, (byte) 0xffffffe0, (byte) 0x30,
                 (byte) 0xffffff81, (byte) 0xffffff97, (byte) 0x6, (byte) 0x9,
                 (byte) 0x2a, (byte) 0xffffff86, (byte) 0x48, (byte) 0xffffff86,
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyStoreSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyStoreSpi.java
index 757234e..86b54c4 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyStoreSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/TestKeyStoreSpi.java
@@ -27,7 +27,7 @@ import javax.crypto.SecretKey;
 public class TestKeyStoreSpi extends KeyStoreSpi {
 
     Map<String, Object> aliases = new HashMap<String, Object>();
-    
+
     public static final Certificate CERT = new MyCertificate("certtype",
             new byte[] {});
     public static final Certificate[] CERTCHAIN = new Certificate[] {
@@ -49,9 +49,9 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
         }
 
     };
-    
-    public static final Object DUMMY = new Object(); 
-    
+
+    public static final Object DUMMY = new Object();
+
     public TestKeyStoreSpi() {
         aliases.put("certalias", CERT);
         aliases.put("chainalias", CERTCHAIN);
@@ -84,13 +84,13 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
         if (cert == null) {
             throw new NullPointerException();
         }
-        
+
         for (Map.Entry<String, Object> alias : aliases.entrySet()) {
             if (alias.getValue() == cert) {
                 return alias.getKey();
             }
         }
-        
+
         return null;
     }
 
@@ -114,11 +114,11 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
                 } else {
                     throw new UnrecoverableKeyException();
                 }
-                
+
             }
             return (Key) aliases.get(alias);
         }
-        
+
         throw new UnrecoverableKeyException();
     }
 
@@ -157,7 +157,7 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
             throw new CertificateException();
         }
     }
-    
+
     @Override
     public void engineLoad(LoadStoreParameter param) throws IOException,
             NoSuchAlgorithmException, CertificateException {
@@ -201,14 +201,14 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
                 throw new KeyStoreException("alias is not a key enrty");
             }
         }
-        
+
         if (key instanceof PrivateKey)
         {
             if (chain == null || chain.length == 0) {
                 throw new IllegalArgumentException();
             }
         }
-        
+
         aliases.put(alias, key);
     }
 
@@ -229,21 +229,21 @@ public class TestKeyStoreSpi extends KeyStoreSpi {
         if (stream == null) {
             throw new IOException("store failed");
         }
-        
+
         if (password == null) {
             throw new NoSuchAlgorithmException();
-        } else if (password.length == 0) { 
+        } else if (password.length == 0) {
             throw new CertificateException();
         }
     }
-    
+
     @Override
     public void engineStore(LoadStoreParameter param) throws IOException,
             NoSuchAlgorithmException, CertificateException {
         if (param == null) {
             throw new IOException();
         }
-        
+
         ProtectionParameter pParam = param.getProtectionParameter();
         if (pParam instanceof PasswordProtection) {
             char[] password = ((PasswordProtection) pParam).getPassword();
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/TestUtils.java b/support/src/test/java/org/apache/harmony/security/tests/support/TestUtils.java
index 011c9f7..d5d8842 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/TestUtils.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/TestUtils.java
@@ -51,7 +51,7 @@ public class TestUtils {
         for (int i=0; i<data.length; i++) {
             String tail = Integer.toHexString(0x000000ff & data[i]);
             if (tail.length() == 1) {
-                tail = "0" + tail; 
+                tail = "0" + tail;
             }
             System.out.print(prefix + "0x" + tail + delimiter);
 
@@ -61,7 +61,7 @@ public class TestUtils {
         }
         System.out.println("");
     }
-    
+
     /**
      * Sets system property
      *
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCRL.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCRL.java
index b95caf7..e8c7356 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCRL.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCRL.java
@@ -27,13 +27,13 @@ import java.security.cert.Certificate;
 
 /**
  * Stub class for <code>java.security.cert.CRL</code> tests
- * 
+ *
  */
 public class MyCRL extends CRL {
 
     /**
      * Constructor
-     * 
+     *
      * @param type
      */
     public MyCRL(String type) {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPath.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPath.java
index ae1db87..0aa4226 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPath.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPath.java
@@ -33,7 +33,7 @@ import java.util.Vector;
 
 /**
  * Stub class for <code>java.security.cert.CertPath</code> tests
- * 
+ *
  */
 public class MyCertPath extends CertPath {
     private static final long serialVersionUID = 7444835599161870893L;
@@ -53,7 +53,7 @@ public class MyCertPath extends CertPath {
 
     /**
      * Constructs new instance of <code>MyCertPath</code>
-     * 
+     *
      */
     public MyCertPath(byte[] encoding) {
         super("MyEncoding");
@@ -74,7 +74,7 @@ public class MyCertPath extends CertPath {
 
     /**
      * @return default encoded form of this cert path
-     * @throws CertificateEncodingException 
+     * @throws CertificateEncodingException
      * @see java.security.cert.CertPath#getEncoded()
      */
     public byte[] getEncoded() throws CertificateEncodingException {
@@ -118,8 +118,8 @@ public class MyCertPath extends CertPath {
         private static final long serialVersionUID = 1609000085450479173L;
 
         private String type;
-        private byte[] data; 
-        
+        private byte[] data;
+
         public MyCertPathRep(String type, byte[] data) {
             super(type, data);
             this.data = data;
@@ -133,7 +133,7 @@ public class MyCertPath extends CertPath {
         public String getType() {
             return type;
         }
-        
+
         public byte[] getData() {
             return data;
         }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathBuilderSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathBuilderSpi.java
index 4fa51fa..1b1e598 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathBuilderSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathBuilderSpi.java
@@ -29,9 +29,9 @@ import java.security.cert.CertPathBuilderSpi;
 import java.security.cert.CertPathParameters;
 
 /**
- * Additional class for verification CertPathBuilderSpi 
- * and CertPathBuilder 
- 
+ * Additional class for verification CertPathBuilderSpi
+ * and CertPathBuilder
+
  */
 
 public class MyCertPathBuilderSpi extends CertPathBuilderSpi {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathValidatorSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathValidatorSpi.java
index fb76927..c763c3f 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathValidatorSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertPathValidatorSpi.java
@@ -32,7 +32,7 @@ import java.security.cert.CertPathValidatorSpi;
 /**
  * Additional class for verification of CertPathValidatorSpi
  * and CertPathValidator
- * 
+ *
  */
 
 public class MyCertPathValidatorSpi extends CertPathValidatorSpi {
@@ -40,7 +40,7 @@ public class MyCertPathValidatorSpi extends CertPathValidatorSpi {
     public CertPathValidatorResult engineValidate(CertPath certPath,
             CertPathParameters params) throws CertPathValidatorException,
             InvalidAlgorithmParameterException {
-        ++sw; 
+        ++sw;
         if (certPath == null) {
             if ((sw % 2) == 0) {
                 throw new CertPathValidatorException("certPath null");
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java
index 1166b41..fe5c408 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java
@@ -26,7 +26,7 @@ import java.security.cert.CertStoreParameters;
 
 /**
  * Class for verification of CertStore and CertStoreSpi
- * 
+ *
  */
 
 public class MyCertStoreParameters implements CertStoreParameters {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreSpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreSpi.java
index fe3002e..d7dd549 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreSpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreSpi.java
@@ -35,14 +35,14 @@ import java.util.Collection;
 /**
  * Additional class for verification CertStoreSpi
  * and CertStore
- * 
+ *
  */
 
 public class MyCertStoreSpi extends CertStoreSpi {
-    
+
     public MyCertStoreSpi(CertStoreParameters params)
             throws InvalidAlgorithmParameterException {
-        super(params);        
+        super(params);
         if (!(params instanceof MyCertStoreParameters)) {
             throw new InvalidAlgorithmParameterException("Invalid params");
         }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificate.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificate.java
index 34ad957..864992d 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificate.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificate.java
@@ -47,7 +47,7 @@ public class MyCertificate extends Certificate implements X509Extension {
 
     /**
      * Constructs new object of class <code>MyCertificate</code>
-     * 
+     *
      * @param type
      * @param encoding
      */
@@ -122,8 +122,8 @@ public class MyCertificate extends Certificate implements X509Extension {
         private static final long serialVersionUID = -3474284043994635553L;
 
         private String type;
-        private byte[] data; 
-        
+        private byte[] data;
+
         public MyCertificateRep(String type, byte[] data) {
             super(type, data);
             this.data = data;
@@ -133,11 +133,11 @@ public class MyCertificate extends Certificate implements X509Extension {
         public Object readResolve() throws ObjectStreamException {
             return super.readResolve();
         }
-        
+
         public String getType() {
             return type;
         }
-        
+
         public byte[] getData() {
             return data;
         }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificateFactorySpi.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificateFactorySpi.java
index f0c444c..1a7ecc8 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificateFactorySpi.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertificateFactorySpi.java
@@ -39,7 +39,7 @@ import java.util.Set;
 /**
  * Additional class for verification CertificateFactorySpi and
  * CertificateFactory classes
- * 
+ *
  */
 
 public class MyCertificateFactorySpi extends CertificateFactorySpi {
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertPath.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertPath.java
index 40966dd..38a4fdb 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertPath.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertPath.java
@@ -7,7 +7,7 @@ public class MyFailingCertPath extends MyCertPath {
     public MyFailingCertPath(byte[] encoding) {
         super(encoding);
     }
-    
+
     @Override
     public byte[] getEncoded() throws CertificateEncodingException {
         throw new CertificateEncodingException("testing purpose");
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertificate.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertificate.java
index c443a5f..e522b27 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertificate.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyFailingCertificate.java
@@ -7,7 +7,7 @@ public class MyFailingCertificate extends MyCertificate {
     public MyFailingCertificate(String type, byte[] encoding) {
         super(type, encoding);
     }
-    
+
     @Override
     public byte[] getEncoded() throws CertificateEncodingException {
         throw new CertificateEncodingException("testing purpose");
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/TestUtils.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/TestUtils.java
index 6f9cbd2..ec062f1 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/TestUtils.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/TestUtils.java
@@ -60,7 +60,7 @@ import java.util.Set;
 
 /**
  * java.security.cert test utilities
- * 
+ *
  */
 public class TestUtils {
     // Certificate type used during testing
@@ -139,17 +139,17 @@ public class TestUtils {
 
     /**
      * Creates test <code>KeyStore</code> instance
-     * 
+     *
      * @param initialize
      *  Do not initialize returned <code>KeyStore</code> if false
-     * 
-     * @param testKeyStoreType 
+     *
+     * @param testKeyStoreType
      *  this parameter ignored if <code>initialize</code> is false;
      *  The following types supported:<br>
      *  1 - <code>KeyStore</code> with untrusted certificates only<br>
      *  2 - <code>KeyStore</code> with trusted certificates only<br>
      *  3 - <code>KeyStore</code> with both trusted and untrusted certificates
-     * 
+     *
      * @return Returns test <code>KeyStore</code> instance
      */
     public static KeyStore getKeyStore(boolean initialize,
@@ -178,7 +178,7 @@ public class TestUtils {
      * Creates <code>List</code> of <code>CollectionCertStores</code>
      *
      * @return The list created
-     * 
+     *
      * @throws InvalidAlgorithmParameterException
      * @throws NoSuchAlgorithmException
      */
@@ -318,20 +318,20 @@ public class TestUtils {
     public static byte[] getEncodedX509Certificate() {
         return ENCODED_X509_CERTIFICATE.getBytes();
     }
-    
+
     /**
      * Returns X.509 certificate encoding corresponding to version v1.
-     * 
+     *
      * Certificate encoding was created by hands according to X.509 Certificate
      * ASN.1 notation. The certificate encoding has the following encoded
-     * field values:<br> 
+     * field values:<br>
      * - version: 1<br>
      * - serialNumber: 5<br>
      * - issuer: CN=Z<br>
      * - notBefore: 13 Dec 1999 14:15:16<br>
      * - notAfter: 01 Jan 2000 00:00:00<br>
      * - subject: CN=Y<br>
-     * 
+     *
      * @return X.509 certificate encoding corresponding to version v1.
      */
     public static byte[] getX509Certificate_v1() {
@@ -394,17 +394,17 @@ public class TestUtils {
             0x01, 0x01, 0x07, //ANY
 
             //
-            // signature: BIT STRING  
+            // signature: BIT STRING
             //
             0x03, 0x02, 0x00, 0x01 };
     }
 
     /**
      * Returns X.509 certificate encoding corresponding to version v3.
-     * 
+     *
      * Certificate encoding was created by hands according to X.509 Certificate
      * ASN.1 notation. The certificate encoding has the following encoded
-     * field values:<br> 
+     * field values:<br>
      * - version: 3<br>
      * - serialNumber: 5<br>
      * - issuer: CN=Z<br>
@@ -412,8 +412,8 @@ public class TestUtils {
      * - notAfter: 01 Jan 2000 00:00:00<br>
      * - subject: CN=Y<br>
      * - extensions:
-     *       1) AuthorityKeyIdentifier(OID=2.5.29.35): no values in it(empty sequence) 
-     * 
+     *       1) AuthorityKeyIdentifier(OID=2.5.29.35): no values in it(empty sequence)
+     *
      * @return X.509 certificate encoding corresponding to version v3.
      */
     public static byte[] getX509Certificate_v3() {
@@ -492,28 +492,28 @@ public class TestUtils {
             0x01, 0x01, 0x07, //ANY
 
             //
-            // signature: BIT STRING  
+            // signature: BIT STRING
             //
             0x03, 0x02, 0x00, 0x01 };
     }
 
     /**
      * Returns X.509 CRL encoding corresponding to version v1.
-     * 
+     *
      * CRL encoding was created by hands according to X.509 CRL ASN.1
-     * notation. The CRL encoding has the following encoded field values:<br> 
+     * notation. The CRL encoding has the following encoded field values:<br>
      * - version: 1<br>
      * - issuer: CN=Z<br>
      * - thisUpdate: 01 Jan 2001 01:02:03<br>
-     * 
+     *
      * @return X.509 CRL encoding corresponding to version v1.
      */
     public static byte[] getX509CRL_v1() {
         return new byte[] {
                 //CertificateList: SEQUENCE
-                0x30, 0x35, 
-                
-                // TBSCertList: SEQUENCE  
+                0x30, 0x35,
+
+                // TBSCertList: SEQUENCE
                 0x30, 0x27,
                 // Version: INTEGER OPTIONAL
                 // 0x02, 0x01, 0x01, - missed here cause it is v1
@@ -521,27 +521,27 @@ public class TestUtils {
                 0x30, 0x06, // SEQUENCE
                 0x06, 0x01, 0x01, // OID
                 0x01, 0x01, 0x11, // ANY
-                // issuer: Name                   
+                // issuer: Name
                 0x30, 0x0C, 0x31, 0x0A, 0x30, 0x08, 0x06, 0x03, 0x55, 0x04,
-                0x03, 0x13, 0x01, 0x5A, // CN=Z 
+                0x03, 0x13, 0x01, 0x5A, // CN=Z
                 // thisUpdate: ChoiceOfTime
                 // GeneralizedTime: 01 Jan 2001 01:02:03
                 0x18, 0x0F, 0x32, 0x30, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31,
                 0x30, 0x31, 0x30, 0x32, 0x30, 0x33, 0x5A,
-                
+
                 // nextUpdate - missed
                 // revokedCertificates - missed
                 // crlExtensions - missed
-                
+
                 // signatureAlgorithm: AlgorithmIdentifier
                 0x30, 0x06, // SEQUENCE
                 0x06, 0x01, 0x01, //OID
                 0x01, 0x01, 0x11, //ANY
-                // signature: BIT STRING  
+                // signature: BIT STRING
                 0x03, 0x02, 0x00, 0x01 };
     }
     //--------------------------------------------------------------------------
-    
+
     // Second example
     /**
      * Certificate:
@@ -570,14 +570,14 @@ public class TestUtils {
                     b0:fc:53:33:73:4a:e5:d0:df
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Subject Key Identifier: 
+            X509v3 Subject Key Identifier:
                 4B:E3:22:14:AD:0A:14:46:B7:52:31:8B:AB:9E:5A:62:F3:98:37:80
-            X509v3 Authority Key Identifier: 
+            X509v3 Authority Key Identifier:
                 keyid:4B:E3:22:14:AD:0A:14:46:B7:52:31:8B:AB:9E:5A:62:F3:98:37:80
                 DirName:/C=AN/ST=Android/O=Android/OU=Android/CN=Android/emailAddress=android
                 serial:00
 
-            X509v3 Basic Constraints: 
+            X509v3 Basic Constraints:
                 CA:TRUE
     Signature Algorithm: sha1WithRSAEncryption
         72:4f:12:8a:4e:61:b2:9a:ba:58:17:0b:55:96:f5:66:1c:a8:
@@ -591,46 +591,46 @@ public class TestUtils {
 
      * </pre>
      */
-    public static final String rootCert = "-----BEGIN CERTIFICATE-----\n" + 
-    "MIIDGzCCAoSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJBTjEQ\n" + 
-    "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5k\n" + 
-    "cm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDAe\n" + 
-    "Fw0wODEyMDkxNjM1MzBaFw0xMTEyMDkxNjM1MzBaMG0xCzAJBgNVBAYTAkFOMRAw\n" + 
-    "DgYDVQQIEwdBbmRyb2lkMRAwDgYDVQQKEwdBbmRyb2lkMRAwDgYDVQQLEwdBbmRy\n" + 
-    "b2lkMRAwDgYDVQQDEwdBbmRyb2lkMRYwFAYJKoZIhvcNAQkBFgdhbmRyb2lkMIGf\n" + 
-    "MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF+15oN4IdWO3LMYwIf1ExTGhAjE0H\n" + 
-    "oQ4YNgJriZLBz4gezwAiAIw36Gp2lHFTgXjhSJT6FmGT66DuYp1q0iy4d53JNtXZ\n" + 
-    "HOsmPENmTXscHcehN2bihFTT7SHdARzsmwweNek3FZ0reKg7ETruwt5VREy9QI3l\n" + 
-    "UrD8UzNzSuXQ3wIDAQABo4HKMIHHMB0GA1UdDgQWBBRL4yIUrQoURrdSMYurnlpi\n" + 
-    "85g3gDCBlwYDVR0jBIGPMIGMgBRL4yIUrQoURrdSMYurnlpi85g3gKFxpG8wbTEL\n" + 
-    "MAkGA1UEBhMCQU4xEDAOBgNVBAgTB0FuZHJvaWQxEDAOBgNVBAoTB0FuZHJvaWQx\n" + 
-    "EDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWQxFjAUBgkqhkiG9w0B\n" + 
-    "CQEWB2FuZHJvaWSCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBy\n" + 
-    "TxKKTmGymrpYFwtVlvVmHKi60Q+Lmy2rqACsf5l99g/Xhet1S+VCN3FGsUqwGxfk\n" + 
-    "+XyfvSB1NZ8njgeV6DS9q+QQX6N7TFZp1NDx6XQVLX938Dh364qZ86mI8GNYB7la\n" + 
-    "Yfj/EecGodH4hfuZHPXLd4Y2zUM3mQnCmtjyKAUGDA==\n" + 
+    public static final String rootCert = "-----BEGIN CERTIFICATE-----\n" +
+    "MIIDGzCCAoSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJBTjEQ\n" +
+    "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5k\n" +
+    "cm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDAe\n" +
+    "Fw0wODEyMDkxNjM1MzBaFw0xMTEyMDkxNjM1MzBaMG0xCzAJBgNVBAYTAkFOMRAw\n" +
+    "DgYDVQQIEwdBbmRyb2lkMRAwDgYDVQQKEwdBbmRyb2lkMRAwDgYDVQQLEwdBbmRy\n" +
+    "b2lkMRAwDgYDVQQDEwdBbmRyb2lkMRYwFAYJKoZIhvcNAQkBFgdhbmRyb2lkMIGf\n" +
+    "MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF+15oN4IdWO3LMYwIf1ExTGhAjE0H\n" +
+    "oQ4YNgJriZLBz4gezwAiAIw36Gp2lHFTgXjhSJT6FmGT66DuYp1q0iy4d53JNtXZ\n" +
+    "HOsmPENmTXscHcehN2bihFTT7SHdARzsmwweNek3FZ0reKg7ETruwt5VREy9QI3l\n" +
+    "UrD8UzNzSuXQ3wIDAQABo4HKMIHHMB0GA1UdDgQWBBRL4yIUrQoURrdSMYurnlpi\n" +
+    "85g3gDCBlwYDVR0jBIGPMIGMgBRL4yIUrQoURrdSMYurnlpi85g3gKFxpG8wbTEL\n" +
+    "MAkGA1UEBhMCQU4xEDAOBgNVBAgTB0FuZHJvaWQxEDAOBgNVBAoTB0FuZHJvaWQx\n" +
+    "EDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWQxFjAUBgkqhkiG9w0B\n" +
+    "CQEWB2FuZHJvaWSCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBy\n" +
+    "TxKKTmGymrpYFwtVlvVmHKi60Q+Lmy2rqACsf5l99g/Xhet1S+VCN3FGsUqwGxfk\n" +
+    "+XyfvSB1NZ8njgeV6DS9q+QQX6N7TFZp1NDx6XQVLX938Dh364qZ86mI8GNYB7la\n" +
+    "Yfj/EecGodH4hfuZHPXLd4Y2zUM3mQnCmtjyKAUGDA==\n" +
     "-----END CERTIFICATE-----";
-    
+
     public static final String rootPrivateKey =
-         "-----BEGIN RSA PRIVATE KEY-----\n" + 
-         "Proc-Type: 4,ENCRYPTED\n" + 
-         "DEK-Info: DES-EDE3-CBC,D9682F66FDA316E5\n" + 
-         "\n" + 
-         "8lGaQPlUZ/iHhdldB//xfNUrZ3RAkBthzKg+n9HBJsjztXXAZ40NGYZmgvpgnfmr\n" + 
-         "7ZJxHxYHFc3GAmBBk9v+/dA8E5yWJa71roffWMQUuFNfGzHhGTOxvNC04W7yAajs\n" + 
-         "CPuyI+xnAAo73F7NVTiqX3NVgu4bB8RVxJyToMe4M289oh93YvxWQ4buVTf0ErJ8\n" + 
-         "Yc8+0ugpfXjGfRhL36qj6B1CcV7NMdXAVExrGlTf0TWT9wVbiROk4XaoaFuWh17h\n" + 
-         "11NEDjsKQ8T4M9kRdC+tKfST8sLik1Pq6jRLIKeX8GQd7tV1IWVZ3KcQBJwu9zLq\n" + 
-         "Hi0GTSF7IWCdwXjDyniMQiSbkmHNP+OnVyhaqew5Ooh0uOEQq/KWFewXg7B3VMr0\n" + 
-         "l6U8sBX9ODGeW0wVdNopvl17udCkV0xm3S+MRZDnZiTlAXwKx/a/gyf5R5XYp3S0\n" + 
-         "0eqrfy2o6Ax4hRkwcNJ2KMeLQNIiYYWKABQj5/i4TYZV6npCIXOnQEkXa9DmqyUE\n" + 
-         "qB7eFj5FcXeqQ8ERmsLveWArsLDn2NNPdv5EaKIs2lrvwoKYeYF7hrKNpifq+QqS\n" + 
-         "u1kN+KHjibcF42EAUozNVmkHsW8VqlywAs4MsMwxU0D57cVGWycuSedraKhc0D6j\n" + 
-         "a4pQOWWY3ZMLoAA1ZmHG9cjDPqcJt0rqk5AhSBRmGVUccfkP7dk9KyJQizro87LI\n" + 
-         "u7zWwMIqTfmlhyfAP0AWjrt/bMN9heGByVA55xkyCdSEVaC5gsIfmGpNy4u+wbZ9\n" + 
-         "rSWVuTfAbjW0n0FW+CDS1LgdjXNkeAP2Uvc1QgVRCPdA23WniLFFJQ==\n" + 
+         "-----BEGIN RSA PRIVATE KEY-----\n" +
+         "Proc-Type: 4,ENCRYPTED\n" +
+         "DEK-Info: DES-EDE3-CBC,D9682F66FDA316E5\n" +
+         "\n" +
+         "8lGaQPlUZ/iHhdldB//xfNUrZ3RAkBthzKg+n9HBJsjztXXAZ40NGYZmgvpgnfmr\n" +
+         "7ZJxHxYHFc3GAmBBk9v+/dA8E5yWJa71roffWMQUuFNfGzHhGTOxvNC04W7yAajs\n" +
+         "CPuyI+xnAAo73F7NVTiqX3NVgu4bB8RVxJyToMe4M289oh93YvxWQ4buVTf0ErJ8\n" +
+         "Yc8+0ugpfXjGfRhL36qj6B1CcV7NMdXAVExrGlTf0TWT9wVbiROk4XaoaFuWh17h\n" +
+         "11NEDjsKQ8T4M9kRdC+tKfST8sLik1Pq6jRLIKeX8GQd7tV1IWVZ3KcQBJwu9zLq\n" +
+         "Hi0GTSF7IWCdwXjDyniMQiSbkmHNP+OnVyhaqew5Ooh0uOEQq/KWFewXg7B3VMr0\n" +
+         "l6U8sBX9ODGeW0wVdNopvl17udCkV0xm3S+MRZDnZiTlAXwKx/a/gyf5R5XYp3S0\n" +
+         "0eqrfy2o6Ax4hRkwcNJ2KMeLQNIiYYWKABQj5/i4TYZV6npCIXOnQEkXa9DmqyUE\n" +
+         "qB7eFj5FcXeqQ8ERmsLveWArsLDn2NNPdv5EaKIs2lrvwoKYeYF7hrKNpifq+QqS\n" +
+         "u1kN+KHjibcF42EAUozNVmkHsW8VqlywAs4MsMwxU0D57cVGWycuSedraKhc0D6j\n" +
+         "a4pQOWWY3ZMLoAA1ZmHG9cjDPqcJt0rqk5AhSBRmGVUccfkP7dk9KyJQizro87LI\n" +
+         "u7zWwMIqTfmlhyfAP0AWjrt/bMN9heGByVA55xkyCdSEVaC5gsIfmGpNy4u+wbZ9\n" +
+         "rSWVuTfAbjW0n0FW+CDS1LgdjXNkeAP2Uvc1QgVRCPdA23WniLFFJQ==\n" +
          "-----END RSA PRIVATE KEY-----";
-    
+
     /**
      * Certificate:
      * <pre>
@@ -658,13 +658,13 @@ public class TestUtils {
                     f3:38:23:b0:97:0e:92:b1:1b
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Basic Constraints: 
+            X509v3 Basic Constraints:
                 CA:FALSE
-            Netscape Comment: 
+            Netscape Comment:
                 OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
+            X509v3 Subject Key Identifier:
                 88:4D:EC:16:26:A7:76:F5:26:43:BC:34:99:DF:D5:EA:7B:F8:5F:DE
-            X509v3 Authority Key Identifier: 
+            X509v3 Authority Key Identifier:
                 keyid:4B:E3:22:14:AD:0A:14:46:B7:52:31:8B:AB:9E:5A:62:F3:98:37:80
 
     Signature Algorithm: sha1WithRSAEncryption
@@ -678,46 +678,46 @@ public class TestUtils {
         6f:98
      * </pre>
      */
-    public static final String  endCert = 
-        "-----BEGIN CERTIFICATE-----\n" + 
-        "MIIC6jCCAlOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJBTjEQ\n" + 
-        "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5k\n" + 
-        "cm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDAe\n" + 
-        "Fw0wODEyMDkxNjQwMzVaFw0wOTEyMDkxNjQwMzVaMIGLMQswCQYDVQQGEwJBTjEQ\n" + 
-        "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEBxMHQW5kcm9pZDEQMA4GA1UEChMHQW5k\n" + 
-        "cm9pZDEQMA4GA1UECxMHQW5kcm9pZDEcMBoGA1UEAxMTQW5kcm9pZCBDZXJ0aWZp\n" + 
-        "Y2F0ZTEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDCBnzANBgkqhkiG9w0BAQEFAAOB\n" + 
-        "jQAwgYkCgYEAuOPex6lARywqb/Uq9M3yLUD6FT8cN2ZzpWdNW6C2sd3cvwHH4sFI\n" + 
-        "Go8czuywolUpmhs6bsx712WuCwU0A4qv2/DcAYCSA7QT5db9eWZ/wxpi1V49wBmk\n" + 
-        "QhVHGebwyLfie4Kixz3frIzVvDm45ZOsP68wt8wAqADzOCOwlw6SsRsCAwEAAaN7\n" + 
-        "MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg\n" + 
-        "Q2VydGlmaWNhdGUwHQYDVR0OBBYEFIhN7BYmp3b1JkO8NJnf1ep7+F/eMB8GA1Ud\n" + 
-        "IwQYMBaAFEvjIhStChRGt1Ixi6ueWmLzmDeAMA0GCSqGSIb3DQEBBQUAA4GBAFVz\n" + 
-        "leZMQPz9UopfgxVJc8rz2F+71vUukOZ/w31NJ9NFxlObquMymUCzqdMUfdXmp3CV\n" + 
-        "MG7cjHtI4ZjRZXrrv7BczcLrMV626d9WlbzreXQnW23IVWMJ0/niQLq0oscsy7E6\n" + 
-        "wtgMITHuaH6XzpgiLsbP8BoRBMqaBt6YSIWsbG+Y\n" + 
+    public static final String  endCert =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIC6jCCAlOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJBTjEQ\n" +
+        "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5k\n" +
+        "cm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDAe\n" +
+        "Fw0wODEyMDkxNjQwMzVaFw0wOTEyMDkxNjQwMzVaMIGLMQswCQYDVQQGEwJBTjEQ\n" +
+        "MA4GA1UECBMHQW5kcm9pZDEQMA4GA1UEBxMHQW5kcm9pZDEQMA4GA1UEChMHQW5k\n" +
+        "cm9pZDEQMA4GA1UECxMHQW5kcm9pZDEcMBoGA1UEAxMTQW5kcm9pZCBDZXJ0aWZp\n" +
+        "Y2F0ZTEWMBQGCSqGSIb3DQEJARYHYW5kcm9pZDCBnzANBgkqhkiG9w0BAQEFAAOB\n" +
+        "jQAwgYkCgYEAuOPex6lARywqb/Uq9M3yLUD6FT8cN2ZzpWdNW6C2sd3cvwHH4sFI\n" +
+        "Go8czuywolUpmhs6bsx712WuCwU0A4qv2/DcAYCSA7QT5db9eWZ/wxpi1V49wBmk\n" +
+        "QhVHGebwyLfie4Kixz3frIzVvDm45ZOsP68wt8wAqADzOCOwlw6SsRsCAwEAAaN7\n" +
+        "MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg\n" +
+        "Q2VydGlmaWNhdGUwHQYDVR0OBBYEFIhN7BYmp3b1JkO8NJnf1ep7+F/eMB8GA1Ud\n" +
+        "IwQYMBaAFEvjIhStChRGt1Ixi6ueWmLzmDeAMA0GCSqGSIb3DQEBBQUAA4GBAFVz\n" +
+        "leZMQPz9UopfgxVJc8rz2F+71vUukOZ/w31NJ9NFxlObquMymUCzqdMUfdXmp3CV\n" +
+        "MG7cjHtI4ZjRZXrrv7BczcLrMV626d9WlbzreXQnW23IVWMJ0/niQLq0oscsy7E6\n" +
+        "wtgMITHuaH6XzpgiLsbP8BoRBMqaBt6YSIWsbG+Y\n" +
         "-----END CERTIFICATE-----";
-    
+
     public static final String endPrivateKey =
-        "-----BEGIN RSA PRIVATE KEY-----\n" + 
-        "Proc-Type: 4,ENCRYPTED\n" + 
-        "DEK-Info: DES-EDE3-CBC,E20AAB000D1D90B1\n" + 
-        "\n" + 
-        "cWrCb6eHuwb6/gnbX12Va47qSpFW0j99Lq2eEj0fqLdlwA6+KvD3/U+Nj4ldaAQ4\n" + 
-        "rYryQv0MJu/kT9z/mJbBI4NwunX/9vXttyuh8s07sv8AqdHCylYR9miz61Q0LkLR\n" + 
-        "9H9D8NWMgMnuVhlj+NUXlkF+Jfriu5xkIqeYDhN8c3/AMawQoNdW/pWmgz0BfFIP\n" + 
-        "DUxszfXHx5mfSMoRdC2YZGlFdsONSO7s14Ayz8+pKD0PzSARXtTEJ5+mELCnhFsw\n" + 
-        "R7zYYwD+9WjL702bjYQxwRS5Sk1Z/VAxLFfjdtlUFSi6VLGIG+jUnM1RF91KtJY1\n" + 
-        "bJOQrlHw9/wyH75y9sXUrVpil4qH9shILHgu4A0VaL7IpIFjWS9vPY7SvwqRlbk7\n" + 
-        "QPhxoIpiNzjzjEa7PG6nSqy8mRzJP0OLWzRUoMWJn6ntf+oj7CzaaIgFrrwRGOCQ\n" + 
-        "BYibTTMZ/paxKDvZ9Lcl8a6uRvi2II2/F63bPcTcILsKDsBdQp93Evanw1QKXdGi\n" + 
-        "jb4b0Y1LYZM0jl7z2TSBZ27HyHKp4jMQP9q9mujEKInjzSB+gsRGfP6++OilrR2U\n" + 
-        "Y7kN2o/ufnPHltel0pUWOHr45IyK8zowgXWtKVl9U+VRwr2thGbdqkRGk55KjJK4\n" + 
-        "Q+OfwvIKHgvn/4cN/BGIA/52eyY//bTFk6ePGY2vlQK4mvB7MeSxtxoCGxdCYQru\n" + 
-        "wI28rOHyQ1cdx141yxlKVSIcxBVZHm8sfh9PHeKMKuaOgc8kfx+Qh8IghFHyJ+yg\n" + 
-        "PboNF9/PiM/glaaBzY2OKTYQKY6LiTetZiI6RdLE7Y+SFwG7Wwo5dg==\n" + 
+        "-----BEGIN RSA PRIVATE KEY-----\n" +
+        "Proc-Type: 4,ENCRYPTED\n" +
+        "DEK-Info: DES-EDE3-CBC,E20AAB000D1D90B1\n" +
+        "\n" +
+        "cWrCb6eHuwb6/gnbX12Va47qSpFW0j99Lq2eEj0fqLdlwA6+KvD3/U+Nj4ldaAQ4\n" +
+        "rYryQv0MJu/kT9z/mJbBI4NwunX/9vXttyuh8s07sv8AqdHCylYR9miz61Q0LkLR\n" +
+        "9H9D8NWMgMnuVhlj+NUXlkF+Jfriu5xkIqeYDhN8c3/AMawQoNdW/pWmgz0BfFIP\n" +
+        "DUxszfXHx5mfSMoRdC2YZGlFdsONSO7s14Ayz8+pKD0PzSARXtTEJ5+mELCnhFsw\n" +
+        "R7zYYwD+9WjL702bjYQxwRS5Sk1Z/VAxLFfjdtlUFSi6VLGIG+jUnM1RF91KtJY1\n" +
+        "bJOQrlHw9/wyH75y9sXUrVpil4qH9shILHgu4A0VaL7IpIFjWS9vPY7SvwqRlbk7\n" +
+        "QPhxoIpiNzjzjEa7PG6nSqy8mRzJP0OLWzRUoMWJn6ntf+oj7CzaaIgFrrwRGOCQ\n" +
+        "BYibTTMZ/paxKDvZ9Lcl8a6uRvi2II2/F63bPcTcILsKDsBdQp93Evanw1QKXdGi\n" +
+        "jb4b0Y1LYZM0jl7z2TSBZ27HyHKp4jMQP9q9mujEKInjzSB+gsRGfP6++OilrR2U\n" +
+        "Y7kN2o/ufnPHltel0pUWOHr45IyK8zowgXWtKVl9U+VRwr2thGbdqkRGk55KjJK4\n" +
+        "Q+OfwvIKHgvn/4cN/BGIA/52eyY//bTFk6ePGY2vlQK4mvB7MeSxtxoCGxdCYQru\n" +
+        "wI28rOHyQ1cdx141yxlKVSIcxBVZHm8sfh9PHeKMKuaOgc8kfx+Qh8IghFHyJ+yg\n" +
+        "PboNF9/PiM/glaaBzY2OKTYQKY6LiTetZiI6RdLE7Y+SFwG7Wwo5dg==\n" +
         "-----END RSA PRIVATE KEY-----";
-    
+
     /**
      * a self signed certificate
      */
@@ -731,7 +731,7 @@ public class TestUtils {
 
     public static CertPathBuilder builder;
     private static CertStore store;
-    
+
     public static void initCertPathSSCertChain() throws CertificateException,
             InvalidAlgorithmParameterException, NoSuchAlgorithmException,
             IOException {
@@ -762,12 +762,12 @@ public class TestUtils {
         theCertSelector.setCertificate(endCertificate);
         theCertSelector.setIssuer(endCertificate.getIssuerX500Principal()
                 .getEncoded());
-        
+
      // build the path
         builder = CertPathBuilder.getInstance("PKIX");
 
     }
-    
+
     public static CertPathBuilder getCertPathBuilder() {
         if (builder == null) {
             throw new RuntimeException(
@@ -775,7 +775,7 @@ public class TestUtils {
         }
         return builder;
     }
-    
+
     public static CertPath buildCertPathSSCertChain()
             throws InvalidAlgorithmParameterException {
 
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/DSAKeyPairGeneratorImpl.java b/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/DSAKeyPairGeneratorImpl.java
index 51c2fcc..58bd71e 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/DSAKeyPairGeneratorImpl.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/DSAKeyPairGeneratorImpl.java
@@ -24,7 +24,7 @@ import java.security.interfaces.DSAParams;
 import java.security.InvalidParameterException;
 
 /**
- * Additional class for verification DSAKeyPairGenerator interface 
+ * Additional class for verification DSAKeyPairGenerator interface
  */
 public class DSAKeyPairGeneratorImpl implements DSAKeyPairGenerator {
 
@@ -32,7 +32,7 @@ public class DSAKeyPairGeneratorImpl implements DSAKeyPairGenerator {
     private SecureRandom secureRandom = null;
     private DSAParams dsaParams = null;
     private int lengthModulus = 0;
-    
+
     public DSAKeyPairGeneratorImpl(DSAParams dsap) {
         dsaKeyPairGenerator = null;
         try {
@@ -53,7 +53,7 @@ public class DSAKeyPairGeneratorImpl implements DSAKeyPairGenerator {
         }
         secureRandom = random;
         dsaParams = params;
-        
+
     }
 
     public void initialize(int modlen, boolean genParams, SecureRandom random)
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/RSAMultiPrimePrivateCrtKeyImpl.java b/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/RSAMultiPrimePrivateCrtKeyImpl.java
index f3a8543..5b3fe17 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/RSAMultiPrimePrivateCrtKeyImpl.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/interfaces/RSAMultiPrimePrivateCrtKeyImpl.java
@@ -22,12 +22,12 @@ import java.math.BigInteger;
 import java.security.spec.RSAOtherPrimeInfo;
 
 /**
- * Additional class for verification RSAMultiPrimePrivateCrtKey interface 
+ * Additional class for verification RSAMultiPrimePrivateCrtKey interface
  */
 public class RSAMultiPrimePrivateCrtKeyImpl implements RSAMultiPrimePrivateCrtKey {
-    
+
     static final long serialVersionUID = 123;
-    
+
     private BigInteger crtCoefficient = null;
     private BigInteger publicExponent = null;
     private BigInteger primeExponentP = null;
@@ -35,13 +35,13 @@ public class RSAMultiPrimePrivateCrtKeyImpl implements RSAMultiPrimePrivateCrtKe
     private BigInteger primeP = null;
     private BigInteger primeQ = null;
     private RSAOtherPrimeInfo[] otherPrimeInfo = null;
-    
+
     public RSAMultiPrimePrivateCrtKeyImpl(BigInteger publicExp,
-                                          BigInteger primeExpP, 
-                                          BigInteger primeExpQ, 
-                                          BigInteger prP, 
-                                          BigInteger prQ, 
-                                          BigInteger crtCft, 
+                                          BigInteger primeExpP,
+                                          BigInteger primeExpQ,
+                                          BigInteger prP,
+                                          BigInteger prQ,
+                                          BigInteger crtCft,
                                           RSAOtherPrimeInfo[] otherPrmInfo) {
         publicExponent = publicExp;
         primeExponentP = primeExpP;
@@ -73,7 +73,7 @@ public class RSAMultiPrimePrivateCrtKeyImpl implements RSAMultiPrimePrivateCrtKe
     public BigInteger getPublicExponent() {
         return publicExponent;
     }
-    
+
     public BigInteger getPrivateExponent() {
         return null;
     }
diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/tmpCallbackHandler.java b/support/src/test/java/org/apache/harmony/security/tests/support/tmpCallbackHandler.java
index 5ac2905..2cdabea 100644
--- a/support/src/test/java/org/apache/harmony/security/tests/support/tmpCallbackHandler.java
+++ b/support/src/test/java/org/apache/harmony/security/tests/support/tmpCallbackHandler.java
@@ -30,7 +30,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 
 /**
  * Additional class for creating CallBackHandler object
- * 
+ *
  */
 
 public class tmpCallbackHandler implements CallbackHandler {
diff --git a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
index 34b5f0d..4f1bb64 100644
--- a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
+++ b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
@@ -24,7 +24,7 @@ package org.apache.harmony.testframework.serialization;
 
 import dalvik.annotation.BrokenTest;
 import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass; 
+import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
 
 import java.io.ByteArrayInputStream;
@@ -60,13 +60,13 @@ import junit.framework.TestCase;
  * To turn on the <b>reference generation mode </b>, the test.mode property
  * should be set to value &quot;serial.reference&quot;. In this mode, no testing
  * is performed but golden files are produced, which contain reference
- * serialized objects. This mode should be run on a pure 
+ * serialized objects. This mode should be run on a pure
  * Implementation classes, which are targeted for compartibility. <br>
  * The location of golden files (in both modes) is controlled via
  * <b>&quot;RESOURCE_DIR&quot; </b> system property.
- * 
+ *
  */
-@TestTargetClass(Serializable.class) 
+@TestTargetClass(Serializable.class)
 public abstract class SerializationTest extends TestCase {
 
     /**
@@ -123,7 +123,7 @@ public abstract class SerializationTest extends TestCase {
     /**
      * This is the main working method of this framework. Subclasses must
      * override it to provide actual objects for testing.
-     * 
+     *
      * @return array of objects to be de/serialized in tests.
      */
     protected abstract Object[] getData();
@@ -138,7 +138,7 @@ public abstract class SerializationTest extends TestCase {
         notes = "",
         method = "!Serialization",
         args = {}
-    )    
+    )
     public void testSelf() throws Throwable {
 
         if (this instanceof SerializableAssert) {
@@ -153,7 +153,7 @@ public abstract class SerializationTest extends TestCase {
      * Tests that data objects can be deserialized from golden files, to verify
      * compatibility with Reference Implementation.
      */
-    
+
     @TestTargetNew(
         level = TestLevel.ADDITIONAL,
         notes = "",
@@ -161,13 +161,13 @@ public abstract class SerializationTest extends TestCase {
         args = {}
     )
     public void testGolden() throws Throwable {
-        
+
         verifyGolden(this, getData());
     }
 
     /**
      * Returns golden file for an object being tested.
-     * 
+     *
      * @param index array index of tested data (as returned by
      *        {@link #getData() getData()})
      * @return corresponding golden file
@@ -187,7 +187,7 @@ public abstract class SerializationTest extends TestCase {
      * Working method for files generation mode. Serializes test objects
      * returned by {@link #getData() getData()}to golden files, each object to
      * a separate file.
-     * 
+     *
      * @throws IOException
      */
     protected void produceGoldenFiles() throws IOException {
@@ -228,10 +228,10 @@ public abstract class SerializationTest extends TestCase {
         ois.close();
         return (Serializable)result;
     }
-    
+
     /**
      * Interface to compare (de)serialized objects
-     * 
+     *
      * Should be implemented if a class under test does not provide specific
      * equals() method and it's instances should to be compared manually.
      */
@@ -239,7 +239,7 @@ public abstract class SerializationTest extends TestCase {
 
         /**
          * Compares deserialized and reference objects.
-         * 
+         *
          * @param initial -
          *            initial object used for creating serialized form
          * @param deserialized -
@@ -323,7 +323,7 @@ public abstract class SerializationTest extends TestCase {
     /**
      * Returns <code>comparator</code> for provided serializable
      * <code>object</code>.
-     * 
+     *
      * The <code>comparator</code> is searched in the following order: <br>-
      * if <code>test</code> implements SerializableAssert interface then it is
      * selected as </code>comparator</code>.<br>- if passed <code>object</code>
@@ -333,7 +333,7 @@ public abstract class SerializationTest extends TestCase {
      * class,for example, if passed <code>object</code> is instance of
      * java.lang.Throwable then <code>THROWABLE_COMPARATOR</code> is used.<br>-
      * otherwise RuntimeException is thrown
-     * 
+     *
      * @param test -
      *            test case
      * @param object -
@@ -366,13 +366,13 @@ public abstract class SerializationTest extends TestCase {
 
         throw new RuntimeException("Failed to detect comparator");
     }
-    
+
     /**
      * Verifies that object deserialized from golden file correctly.
-     * 
+     *
      * The method invokes <br>
      * verifyGolden(test, object, defineComparator(test, object));
-     * 
+     *
      * @param test -
      *            test case
      * @param object -
@@ -386,12 +386,12 @@ public abstract class SerializationTest extends TestCase {
 
     /**
      * Verifies that object deserialized from golden file correctly.
-     * 
+     *
      * The method loads "<code>testName</code>.golden.ser" resource file
      * from "<module root>/src/test/resources/serialization/<code>testPackage</code>"
      * folder, reads an object from the loaded file and compares it with
      * <code>object</code> using specified <code>comparator</code>.
-     * 
+     *
      * @param test-
      *            test case
      * @param object-
@@ -412,10 +412,10 @@ public abstract class SerializationTest extends TestCase {
     /**
      * Verifies that objects from array deserialized from golden files
      * correctly.
-     * 
+     *
      * The method invokes <br>
      * verifyGolden(test, objects, defineComparator(test, object[0]));
-     * 
+     *
      * @param test -
      *            test case
      * @param objects -
@@ -431,14 +431,14 @@ public abstract class SerializationTest extends TestCase {
     /**
      * Verifies that objects from array deserialized from golden files
      * correctly.
-     * 
+     *
      * The method loads "<code>testName</code>.golden.<code>N</code>.ser"
      * resource files from "<module root>/src/test/resources/serialization/<code>testPackage</code>"
      * folder, from each loaded file it reads an object from and compares it
      * with corresponding object in provided array (i.e. <code>objects[N]</code>)
      * using specified <code>comparator</code>. (<code>N</code> is index
      * in object's array.)
-     * 
+     *
      * @param test-
      *            test case
      * @param objects -
@@ -456,13 +456,13 @@ public abstract class SerializationTest extends TestCase {
                     deserialized);
         }
     }
-    
+
     /**
      * Verifies that object can be smoothly serialized/deserialized.
-     * 
+     *
      * The method invokes <br>
      * verifySelf(object, defineComparator(null, object));
-     * 
+     *
      * @param object -
      *            to be serialized/deserialized
      */
@@ -471,13 +471,13 @@ public abstract class SerializationTest extends TestCase {
 
         verifySelf(object, defineComparator(null, object));
     }
-    
+
     /**
      * Verifies that object can be smoothly serialized/deserialized.
-     * 
+     *
      * The method serialize/deserialize <code>object</code> and compare it
      * with initial <code>object</code>.
-     * 
+     *
      * @param object -
      *            object to be serialized/deserialized
      * @param comparator -
@@ -495,10 +495,10 @@ public abstract class SerializationTest extends TestCase {
     /**
      * Verifies that that objects from array can be smoothly
      * serialized/deserialized.
-     * 
+     *
      * The method invokes <br>
      * verifySelf(objects, defineComparator(null, object[0]));
-     * 
+     *
      * @param objects -
      *            array of objects to be serialized/deserialized
      */
@@ -508,14 +508,14 @@ public abstract class SerializationTest extends TestCase {
         Assert.assertFalse("Empty array", objects.length == 0);
         verifySelf(objects, defineComparator(null, objects[0]));
     }
-    
+
     /**
      * Verifies that that objects from array can be smoothly
      * serialized/deserialized.
-     * 
+     *
      * The method serialize/deserialize each object in <code>objects</code>
      * array and compare it with initial object.
-     * 
+     *
      * @param objects -
      *            array of objects to be serialized/deserialized
      * @param comparator -
@@ -548,13 +548,13 @@ public abstract class SerializationTest extends TestCase {
 
         return getObjectFromStream(in);
     }
-    
+
     /**
      * Creates golden file.
-     * 
+     *
      * The folder for created file is: <code>root + test's package name</code>.
      * The file name is: <code>test's name + "golden.ser"</code>
-     * 
+     *
      * @param root -
      *            root directory for serialization resource files
      * @param test -
@@ -586,10 +586,10 @@ public abstract class SerializationTest extends TestCase {
         Assert.fail("Generating golden file.\nGolden file name:"
                 + goldenFile.getAbsolutePath());
     }
-    
+
     /**
      * Copies an object by serializing/deserializing it.
-     * 
+     *
      * @param initial -
      *            an object to be copied
      * @return copy of provided object
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/KeyManagerFactorySpiImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/KeyManagerFactorySpiImpl.java
index b8e3ee0..2427f84 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/KeyManagerFactorySpiImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/KeyManagerFactorySpiImpl.java
@@ -10,25 +10,25 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.ManagerFactoryParameters;
 
 public class KeyManagerFactorySpiImpl extends MyKeyManagerFactorySpi {
-    
+
     private boolean isInitialized = false;
-    
+
     public void engineInit(KeyStore ks, char[] password)
             throws KeyStoreException, NoSuchAlgorithmException,
             UnrecoverableKeyException {
-        
+
         if (ks == null && password == null) {
-            throw new NoSuchAlgorithmException();            
+            throw new NoSuchAlgorithmException();
         }
-        
+
         if (ks == null) {
             throw new KeyStoreException();
         }
-        
+
         if (password == null) {
-            throw new UnrecoverableKeyException();            
+            throw new UnrecoverableKeyException();
         }
-        
+
         isInitialized = true;
     }
 
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
index 0c16029..a82bb9a 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
@@ -30,16 +30,16 @@ import javax.net.ssl.ManagerFactoryParameters;
 /**
  * Class for verification KeyManagerFactorySpi and KeyManagerFactory
  * functionality
- * 
+ *
  */
 
 public class MyKeyManagerFactorySpi extends KeyManagerFactorySpi {
-    
+
     protected void engineInit(KeyStore ks, char[] password)
             throws KeyStoreException, NoSuchAlgorithmException,
             UnrecoverableKeyException {
         if (password == null) {
-            throw new KeyStoreException("Incorrect password");            
+            throw new KeyStoreException("Incorrect password");
         }
         if (ks == null) {
             throw new UnrecoverableKeyException("Incorrect keystore");
@@ -56,7 +56,7 @@ public class MyKeyManagerFactorySpi extends KeyManagerFactorySpi {
                 engineInit(((Parameters)spec).getKeyStore(),
                         ((Parameters)spec).getPassword());
             } catch (Exception e) {
-                throw new InvalidAlgorithmParameterException(e.toString()); 
+                throw new InvalidAlgorithmParameterException(e.toString());
             }
         } else {
             throw new InvalidAlgorithmParameterException("Invalid parameter");
@@ -71,7 +71,7 @@ public class MyKeyManagerFactorySpi extends KeyManagerFactorySpi {
         private char[] passWD;
         public Parameters (KeyStore ks, char[] pass) {
             this.keyStore = ks;
-            this.passWD = pass; 
+            this.passWD = pass;
         }
         public KeyStore getKeyStore() {
             return keyStore;
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
index a87e75d..489273c 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
@@ -35,7 +35,7 @@ import javax.net.ssl.TrustManager;
 /**
  * Additional class for verification of SSLContextSpi and SSLContext
  * functionality
- * 
+ *
  */
 
 public class MySSLContextSpi extends SSLContextSpi {
@@ -52,7 +52,7 @@ public class MySSLContextSpi extends SSLContextSpi {
     protected SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
-        }   
+        }
         return null;
     }
 
@@ -79,7 +79,7 @@ public class MySSLContextSpi extends SSLContextSpi {
 
     /*
      * FIXME: add these methods
-     */   
+     */
     protected SSLEngine engineCreateSSLEngine(String host, int port) {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -93,20 +93,20 @@ public class MySSLContextSpi extends SSLContextSpi {
         }
         return new tmpSSLEngine();
     }
-    
+
     public class tmpSSLEngine extends SSLEngine {
         String tmpHost;
         int tmpPort;
         public tmpSSLEngine() {
             tmpHost = null;
-            tmpPort = 0;        
+            tmpPort = 0;
         }
         public tmpSSLEngine(String host, int port) {
             tmpHost = host;
-            tmpPort = port;        
+            tmpPort = port;
         }
         public String getPeerHost() {
-            return tmpHost;        
+            return tmpHost;
         }
         public int getPeerPort() {
             return tmpPort;
@@ -132,13 +132,13 @@ public class MySSLContextSpi extends SSLContextSpi {
         public void setEnableSessionCreation(boolean flag) { }
         public void setNeedClientAuth(boolean need) { }
         public void setUseClientMode(boolean mode) { }
-        public void setWantClientAuth(boolean want) { }        
+        public void setWantClientAuth(boolean want) { }
         public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
                 int offset, int length) throws SSLException {
             return null;
-        }        
+        }
         public SSLEngineResult wrap(ByteBuffer[] srcs, int offset,
-                int length, ByteBuffer dst) throws SSLException { 
+                int length, ByteBuffer dst) throws SSLException {
             return null;
         }
     }
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
index 6a6c1ba..9f9fa86 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
@@ -26,9 +26,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactorySpi;
 
 /**
- * Class for vertifying TrustManagerFactorySpi and TrustManagerFactory 
+ * Class for vertifying TrustManagerFactorySpi and TrustManagerFactory
  * functionality
- * 
+ *
  */
 
 public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
@@ -57,8 +57,8 @@ public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
     protected TrustManager[] engineGetTrustManagers() {
         return null;
     }
-    
-    
+
+
     public static class Parameters implements ManagerFactoryParameters {
         private KeyStore keyStore;
         public Parameters (KeyStore ks) {
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLContextSpiImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLContextSpiImpl.java
index fa463d5..5242a0a 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLContextSpiImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLContextSpiImpl.java
@@ -15,9 +15,9 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 
 public class SSLContextSpiImpl extends MySSLContextSpi {
-    
+
     private boolean init = false;
-    
+
     public void engineInit(KeyManager[] km, TrustManager[] tm,
             SecureRandom sr) throws KeyManagementException {
         if (sr == null) {
@@ -30,7 +30,7 @@ public class SSLContextSpiImpl extends MySSLContextSpi {
     public SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
-        }   
+        }
         return null;
     }
 
@@ -57,14 +57,14 @@ public class SSLContextSpiImpl extends MySSLContextSpi {
 
     /*
      * FIXME: add these methods
-     */   
+     */
     public SSLEngine engineCreateSSLEngine(String host, int port) {
         int max = 65535;
-        
+
         if (port < 0 || port > max) {
             throw new IllegalArgumentException("Illegal port");
         }
-        
+
         if (!init) {
             throw new RuntimeException("Not initialiazed");
         }
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLSocketFactoryImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLSocketFactoryImpl.java
index 18a9c96..b3deeb9 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLSocketFactoryImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/SSLSocketFactoryImpl.java
@@ -9,12 +9,12 @@ import java.net.UnknownHostException;
 
 
 public class SSLSocketFactoryImpl extends SSLSocketFactory {
-    
+
     public SSLSocketFactoryImpl() {
         super();
     }
-    
-    public Socket createSocket(Socket socket, String s, int i, boolean flag) 
+
+    public Socket createSocket(Socket socket, String s, int i, boolean flag)
                                throws IOException {
         if (socket == null) {
             throw new IOException("incorrect socket");
@@ -25,7 +25,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
         if (s == null || s.equals("")) {
             throw new UnknownHostException("incorrect host");
         }
-        
+
         if (!flag) {
             socket = new Socket(s, i);
         } else {
@@ -34,15 +34,15 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
         }
         return socket;
     }
-    
+
     public String[] getDefaultCipherSuites() {
         return null;
     }
-    
+
     public String[] getSupportedCipherSuites() {
         return null;
     }
-    
+
     /**
      * @see javax.net.SocketFactory#createSocket(java.lang.String, int)
      */
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/TrustManagerFactorySpiImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/TrustManagerFactorySpiImpl.java
index a6de5b2..79bb05c 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/TrustManagerFactorySpiImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/TrustManagerFactorySpiImpl.java
@@ -8,12 +8,12 @@ import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.TrustManager;
 
 public class TrustManagerFactorySpiImpl extends MyTrustManagerFactorySpi {
-    
+
     private static boolean isengineInitCalled = false;
     private static boolean isEngineGetTrustManagersCalled = false;
     private static KeyStore ks = null;
     private static ManagerFactoryParameters spec = null;
-    
+
     public void engineInit(KeyStore ks) throws KeyStoreException {
         isengineInitCalled = true;
         this.ks = ks;
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/X509KeyManagerImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/X509KeyManagerImpl.java
index c679b01..65df555 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/X509KeyManagerImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/X509KeyManagerImpl.java
@@ -14,13 +14,13 @@ import java.net.Socket;
 import javax.net.ssl.X509KeyManager;
 
 public class X509KeyManagerImpl implements X509KeyManager {
-    
+
     private String keyType;
     private String client = "CLIENT";
     private String server = "SERVER";
     private KeyStore keyTest;
     private X509Certificate[] cert = null;
-    
+
  // creating a certificate
     String certificate = "-----BEGIN CERTIFICATE-----\n"
             + "MIICZTCCAdICBQL3AAC2MA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw\n"
@@ -83,8 +83,8 @@ public class X509KeyManagerImpl implements X509KeyManager {
 
     ByteArrayInputStream certArray3 = new ByteArrayInputStream(certificate3
             .getBytes());
-    
-    
+
+
     public X509KeyManagerImpl(String name) {
         keyType = name;
         try {
@@ -112,7 +112,7 @@ public class X509KeyManagerImpl implements X509KeyManager {
             throw new IllegalArgumentException(ex.getMessage());
         }
     }
-    
+
     public String[] getClientAliases(String s, Principal[] aprincipal) {
         if (s == null || s.equals("")) {
             return null;
@@ -136,7 +136,7 @@ public class X509KeyManagerImpl implements X509KeyManager {
             throw new IllegalArgumentException(ex.getMessage());
         }
     }
-    
+
     public String chooseClientAlias(String[] as, Principal[] aprincipal, Socket socket) {
         String alias = null;
         if (as == null || as.length == 0) {
@@ -156,7 +156,7 @@ public class X509KeyManagerImpl implements X509KeyManager {
         }
         return null;
     }
-    
+
     public String[] getServerAliases(String s, Principal aprincipal[]) {
         if (s == null || s.equals("")) {
             return null;
@@ -175,12 +175,12 @@ public class X509KeyManagerImpl implements X509KeyManager {
                     res[i] = vec.elementAt(i).toString();
                 }
                 return res;
-            } else return null; 
+            } else return null;
         } catch (Exception ex) {
             throw new IllegalArgumentException(ex.getMessage());
         }
     }
-    
+
     public String chooseServerAlias(String as, Principal[] aprincipal, Socket socket) {
         String alias = null;
         if (as == null || as.equals("")) {
@@ -194,7 +194,7 @@ public class X509KeyManagerImpl implements X509KeyManager {
             throw new IllegalArgumentException(ex.getMessage());
         }
     }
-    
+
     public X509Certificate[] getCertificateChain(String s) {
         /*try {
             if (s != null && !s.equals("")) {
@@ -206,7 +206,7 @@ public class X509KeyManagerImpl implements X509KeyManager {
         }*/
         return null;
     }
-    
+
     public PrivateKey getPrivateKey(String s) {
         /*try {
             if (s != null && !s.equals("")) {
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/X509TrustManagerImpl.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/X509TrustManagerImpl.java
index 47fe92f..73258b9 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/X509TrustManagerImpl.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/X509TrustManagerImpl.java
@@ -5,37 +5,37 @@ import java.security.cert.X509Certificate;
 import java.security.cert.CertificateException;
 
 public class X509TrustManagerImpl implements X509TrustManager {
-    
+
     public void checkClientTrusted(X509Certificate[] ax509certificate, String s)
                                    throws CertificateException {
-        
+
         if(ax509certificate == null || ax509certificate.length == 0)
             throw new IllegalArgumentException("null or zero-length certificate chain");
         if(s == null || s.length() == 0)
             throw new IllegalArgumentException("null or zero-length authentication type");
-        
+
         for (int i = 0; i < ax509certificate.length; i++) {
             if (ax509certificate[i].getVersion() != 3) {
                 throw new CertificateException();
             }
         }
     }
-    
+
     public void checkServerTrusted(X509Certificate[] ax509certificate, String s)
                                    throws CertificateException {
-        
+
         if(ax509certificate == null || ax509certificate.length == 0)
             throw new IllegalArgumentException("null or zero-length certificate chain");
         if(s == null || s.length() == 0)
             throw new IllegalArgumentException("null or zero-length authentication type");
-        
+
         for (int i = 0; i < ax509certificate.length; i++) {
             if (ax509certificate[i].getVersion() != 3) {
                 throw new CertificateException();
             }
         }
     }
-    
+
     public X509Certificate[] getAcceptedIssuers() {
         X509Certificate[] cert = new X509Certificate[0];
         return cert;
diff --git a/support/src/test/java/org/apache/harmony/xnet/tests/support/mySSLSession.java b/support/src/test/java/org/apache/harmony/xnet/tests/support/mySSLSession.java
index 633990b..6ca6177 100644
--- a/support/src/test/java/org/apache/harmony/xnet/tests/support/mySSLSession.java
+++ b/support/src/test/java/org/apache/harmony/xnet/tests/support/mySSLSession.java
@@ -19,7 +19,7 @@ import javax.net.ssl.SSLSession;
 import org.apache.harmony.security.tests.support.TestCertUtils;
 
 public class mySSLSession implements SSLSession {
-    
+
     private byte[] idData;
     private String nameHost = null;
     private int namePort = -1;
@@ -27,21 +27,21 @@ public class mySSLSession implements SSLSession {
     private boolean invalidateDone = false;
     private Certificate[] certs = null;
     private X509Certificate[] xCerts = null;
-    
+
     public mySSLSession(String host, int port, byte[] id) {
         certs = null;
         xCerts = null;
         nameHost = host;
         namePort = port;
         idData = id;
-        table = new Hashtable();            
+        table = new Hashtable();
     }
-    
+
     public mySSLSession(X509Certificate[] xc) {
         certs = TestCertUtils.getCertChain();
         xCerts = xc;
     }
-    
+
     public mySSLSession(Certificate[] xc) throws CertificateEncodingException, CertificateException {
         certs = xc;
         xCerts = new X509Certificate[xc.length];
@@ -50,42 +50,42 @@ public class mySSLSession implements SSLSession {
             xCerts[i++] = X509Certificate.getInstance(cert.getEncoded());
         }
     }
-    
+
     public mySSLSession() {
     }
-    
+
     public int getApplicationBufferSize() {
         return 1234567;
     }
-    
+
     public String getCipherSuite() {
         return "SuiteName";
     }
-    
+
     public long getCreationTime() {
         return 1000l;
     }
-    
+
     public byte[] getId() {
         return idData;
     }
-    
+
     public long getLastAccessedTime() {
         return 2000l;
     }
-    
+
     public Certificate[] getLocalCertificates() {
         return null;
     }
-    
+
     public Principal getLocalPrincipal() {
         return null;
     }
-    
+
     public int getPacketBufferSize() {
         return 12345;
     }
-    
+
     public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException {
         if (certs == null) {
             throw new SSLPeerUnverifiedException("peer not authenticated");
@@ -93,7 +93,7 @@ public class mySSLSession implements SSLSession {
             return certs;
         }
     }
-    
+
     public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException {
         if(xCerts == null) {
             throw new SSLPeerUnverifiedException("peer not authenticated");
@@ -101,27 +101,27 @@ public class mySSLSession implements SSLSession {
             return xCerts;
         }
     }
-    
+
     public String getPeerHost() {
         return nameHost;
     }
-    
+
     public int getPeerPort() {
         return namePort;
     }
-    
+
     public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
         return null;
     }
-    
+
     public String getProtocol() {
         return "ProtocolName";
     }
-    
+
     public SSLSessionContext getSessionContext() {
         return null;
     }
-    
+
     public void putValue(String s, Object obj) {
         if(s == null || obj == null)
             throw new IllegalArgumentException("arguments can not be null");
@@ -135,7 +135,7 @@ public class mySSLSession implements SSLSession {
             ((SSLSessionBindingListener)obj).valueBound(sslsessionbindingevent1);
         }
     }
-    
+
     public void removeValue(String s) {
         if(s == null)
             throw new IllegalArgumentException("argument can not be null");
@@ -145,7 +145,7 @@ public class mySSLSession implements SSLSession {
             ((SSLSessionBindingListener)obj).valueUnbound(sslsessionbindingevent);
         }
     }
-    
+
     public Object getValue(String s) {
         if(s == null) {
             throw new IllegalArgumentException("argument can not be null");
@@ -153,7 +153,7 @@ public class mySSLSession implements SSLSession {
             return table.get(s);
         }
     }
-    
+
     public String[] getValueNames() {
         Vector vector = new Vector();
         Enumeration enumeration = table.keys();
@@ -164,11 +164,11 @@ public class mySSLSession implements SSLSession {
         vector.copyInto(as);
         return as;
     }
-    
+
     public void invalidate() {
         invalidateDone = true;
     }
-    
+
     public boolean isValid() {
         return invalidateDone;
     }
diff --git a/support/src/test/java/targets/Charsets.java b/support/src/test/java/targets/Charsets.java
index 61f8301..f33990f 100644
--- a/support/src/test/java/targets/Charsets.java
+++ b/support/src/test/java/targets/Charsets.java
@@ -9,9 +9,9 @@ import java.nio.charset.IllegalCharsetNameException;
  * @hide
  */
 public interface Charsets {
-    
+
     /**
-     * @hide 
+     * @hide
      */
     static abstract class _Abstract extends Charset {
 
diff --git a/support/src/test/java/tests/support/Support_ASimpleInputStream.java b/support/src/test/java/tests/support/Support_ASimpleInputStream.java
index 77dfcd2..06c986b 100644
--- a/support/src/test/java/tests/support/Support_ASimpleInputStream.java
+++ b/support/src/test/java/tests/support/Support_ASimpleInputStream.java
@@ -30,7 +30,7 @@ public class Support_ASimpleInputStream extends InputStream {
         this();
         throwExceptionOnNextUse = throwException;
     }
-    
+
     public Support_ASimpleInputStream(String input) {
         buf = input.getBytes();
         pos = 0;
diff --git a/support/src/test/java/tests/support/Support_ASimpleOutputStream.java b/support/src/test/java/tests/support/Support_ASimpleOutputStream.java
index 3ace4f9..60d85be 100644
--- a/support/src/test/java/tests/support/Support_ASimpleOutputStream.java
+++ b/support/src/test/java/tests/support/Support_ASimpleOutputStream.java
@@ -43,7 +43,7 @@ public class Support_ASimpleOutputStream extends OutputStream {
             throw new IOException("Exception thrown for testing purpose.");
         }
     }
-    
+
     @Override
     public void flush() throws IOException {
         if (throwExceptionOnNextUse) {
@@ -67,7 +67,7 @@ public class Support_ASimpleOutputStream extends OutputStream {
 //            throw new IOException("Exception thrown for testing purposes.");
 //        }
 //        if (offset < 0 || count < 0 || (offset + count) > buffer.length) {
-//            throw new IndexOutOfBoundsException(); 
+//            throw new IndexOutOfBoundsException();
 //        }
 //        for (int i = offset; i < offset + count; i++) {
 //            write(buffer[i]);
diff --git a/support/src/test/java/tests/support/Support_ASimpleReader.java b/support/src/test/java/tests/support/Support_ASimpleReader.java
index a98160c..2bcb2ff 100644
--- a/support/src/test/java/tests/support/Support_ASimpleReader.java
+++ b/support/src/test/java/tests/support/Support_ASimpleReader.java
@@ -30,7 +30,7 @@ public class Support_ASimpleReader extends Reader {
         this();
         throwExceptionOnNextUse = throwException;
     }
-    
+
     public Support_ASimpleReader(String input) {
         buf = input.toCharArray();
         pos = 0;
diff --git a/support/src/test/java/tests/support/Support_ASimpleWriter.java b/support/src/test/java/tests/support/Support_ASimpleWriter.java
index 17b7647..9f66f44 100644
--- a/support/src/test/java/tests/support/Support_ASimpleWriter.java
+++ b/support/src/test/java/tests/support/Support_ASimpleWriter.java
@@ -30,7 +30,7 @@ public class Support_ASimpleWriter extends Writer {
         this(DEFAULT_BUFFER_SIZE);
         throwExceptionOnNextUse = throwException;
     }
-    
+
     public Support_ASimpleWriter(int bufferSize) {
         buf = new char[bufferSize];
         pos = 0;
@@ -43,7 +43,7 @@ public class Support_ASimpleWriter extends Writer {
             throw new IOException("Exception thrown for testing purpose.");
         }
     }
-    
+
     @Override
     public void flush() throws IOException {
         if (throwExceptionOnNextUse) {
@@ -57,7 +57,7 @@ public class Support_ASimpleWriter extends Writer {
             throw new IOException("Exception thrown for testing purpose.");
         }
         if (offset < 0 || count < 0 || (offset + count) > buf.length) {
-            throw new IndexOutOfBoundsException(); 
+            throw new IndexOutOfBoundsException();
         }
         try {
             System.arraycopy(src, offset, buf, pos, count);
diff --git a/support/src/test/java/tests/support/Support_BitSet.java b/support/src/test/java/tests/support/Support_BitSet.java
index 2adbb9f..eae33bb 100644
--- a/support/src/test/java/tests/support/Support_BitSet.java
+++ b/support/src/test/java/tests/support/Support_BitSet.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,9 +26,9 @@ public class Support_BitSet {
 
     /**
      * Create a new BitSet with size equal to 64 bits
-     * 
+     *
      * @return The number of bits contained in this BitSet.
-     * 
+     *
      * @see #clear
      * @see #set
      */
@@ -40,7 +40,7 @@ public class Support_BitSet {
      * Create a new BitSet with size equal to nbits. If nbits is not a multiple
      * of 64, then create a BitSet with size nbits rounded to the next closest
      * multiple of 64.
-     * 
+     *
      * @exception NegativeArraySizeException
      *                if nbits < 0.
      * @see #clear
@@ -56,10 +56,10 @@ public class Support_BitSet {
 
     /**
      * Clears the bit at index pos. Grows the BitSet if pos > size.
-     * 
+     *
      * @param pos
      *            int
-     * 
+     *
      * @exception IndexOutOfBoundsException
      *                when pos < 0
      * @see #set
@@ -78,12 +78,12 @@ public class Support_BitSet {
 
     /**
      * Retrieve the bit at index pos. Grows the BitSet if pos > size.
-     * 
+     *
      * @param pos
      *            int
      * @return A boolean value indicating whether the bit at pos has been set.
      *         Answers false if pos > size().
-     * 
+     *
      * @exception IndexOutOfBoundsException
      *                when pos < 0
      * @see #set
@@ -102,7 +102,7 @@ public class Support_BitSet {
     /**
      * Increase the size of the internal array to accomodate pos bits. The new
      * array max index will be a multiple of 64
-     * 
+     *
      * @param pos
      *            int The index the new array needs to be able to access
      */
@@ -116,10 +116,10 @@ public class Support_BitSet {
 
     /**
      * Sets the bit at index pos to 1. Grows the BitSet if pos > size.
-     * 
+     *
      * @param pos
      *            int
-     * 
+     *
      * @exception IndexOutOfBoundsException
      *                when pos < 0
      * @see #clear
@@ -137,9 +137,9 @@ public class Support_BitSet {
 
     /**
      * Clears the bit at index pos.
-     * 
+     *
      * @return The number of bits contained in this BitSet.
-     * 
+     *
      * @see #BitSet
      * @see #clear
      * @see #set
@@ -151,7 +151,7 @@ public class Support_BitSet {
     /**
      * Answers a string containing a concise, human-readable description of the
      * receiver.
-     * 
+     *
      * @return A comma delimited list of the indices of all bits that are set.
      */
     @Override
@@ -182,7 +182,7 @@ public class Support_BitSet {
 
     /**
      * Returns the number of bits up to and including the highest bit set.
-     * 
+     *
      */
     public int length() {
         int idx = bits.length - 1;
diff --git a/support/src/test/java/tests/support/Support_ClassLoader.java b/support/src/test/java/tests/support/Support_ClassLoader.java
index 81de979..3ba1d7e 100644
--- a/support/src/test/java/tests/support/Support_ClassLoader.java
+++ b/support/src/test/java/tests/support/Support_ClassLoader.java
@@ -29,11 +29,11 @@ import dalvik.system.DexClassLoader;
 public abstract class Support_ClassLoader {
 
     public abstract ClassLoader getClassLoader(URL url, ClassLoader parent);
-    
+
     public static ClassLoader getInstance(URL url, ClassLoader parent) {
         try {
-            Support_ClassLoader factory; 
-            
+            Support_ClassLoader factory;
+
             if ("Dalvik".equals(System.getProperty("java.vm.name"))) {
                 factory = (Support_ClassLoader)Class.forName(
                     "tests.support.Support_ClassLoader$Dalvik").newInstance();
@@ -41,7 +41,7 @@ public abstract class Support_ClassLoader {
                 factory = (Support_ClassLoader)Class.forName(
                     "tests.support.Support_ClassLoader$RefImpl").newInstance();
             }
-            
+
             return factory.getClassLoader(url, parent);
         } catch (Exception ex) {
             throw new RuntimeException("Unable to create ClassLoader", ex);
@@ -70,7 +70,7 @@ public abstract class Support_ClassLoader {
                     null, parent);
         }
     }
-    
+
     /**
      * Implementation for the reference implementation. Nothing interesting to
      * see here. Please get along.
diff --git a/support/src/test/java/tests/support/Support_CollectionTest.java b/support/src/test/java/tests/support/Support_CollectionTest.java
index 824768a..6ff1868 100644
--- a/support/src/test/java/tests/support/Support_CollectionTest.java
+++ b/support/src/test/java/tests/support/Support_CollectionTest.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import java.util.TreeSet;
  * @tests java.util.Collection
  */
 @TestTargetClass(java.util.Collection.class)
-public class Support_CollectionTest extends junit.framework.TestCase { 
+public class Support_CollectionTest extends junit.framework.TestCase {
     Collection<Integer> col; // must contain the Integers 0 to 99
 
     public Support_CollectionTest(String p1) {
diff --git a/support/src/test/java/tests/support/Support_Configuration.java b/support/src/test/java/tests/support/Support_Configuration.java
index 19af32e..fb5b468 100644
--- a/support/src/test/java/tests/support/Support_Configuration.java
+++ b/support/src/test/java/tests/support/Support_Configuration.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -64,7 +64,7 @@ public class Support_Configuration {
     public static String InetTestAddress = "localhost";
 
     public static String InetTestIP = "127.0.0.1";
-    
+
     // BEGIN android-added
     public static byte[] InetTestAddr = {127, 0, 0, 1};
     // END android-added
@@ -102,17 +102,17 @@ public class Support_Configuration {
     // END android-changed
 
     public static String testURL = "harmony.apache.org";
-    
+
     public static String hTTPURLwExpiration = "http://phpwiki.sourceforge.net/phpwiki-1.2/";
-    
+
     public static String hTTPURLwLastModified = "http://www.php.net/manual/en/function.explode.php";
-    
+
     public static String hTTPURLyahoo = "http://news.yahoo.com/";
-    
+
     public static String hTTPURLgoogle = "http://www.google.com/ie";
-    
+
     public static String testContentEncoding = "http://www.amazon.com/";
-    
+
     public static int SpecialInetTestAddressNumber = 4;
 
     /**
diff --git a/support/src/test/java/tests/support/Support_DeleteOnExitTest.java b/support/src/test/java/tests/support/Support_DeleteOnExitTest.java
index 0ce7655..c3d3a8b 100644
--- a/support/src/test/java/tests/support/Support_DeleteOnExitTest.java
+++ b/support/src/test/java/tests/support/Support_DeleteOnExitTest.java
@@ -11,7 +11,7 @@ public class Support_DeleteOnExitTest {
     public static void main(String[] args) throws Exception {
         File file1 = new File(args[0]);
         File file2 = new File(args[1]);
-        
+
         file1.deleteOnExit();
         file2.deleteOnExit();
         Runtime.getRuntime().exit(0);
diff --git a/support/src/test/java/tests/support/Support_Exec.java b/support/src/test/java/tests/support/Support_Exec.java
index 2e709a5..124dcdc 100644
--- a/support/src/test/java/tests/support/Support_Exec.java
+++ b/support/src/test/java/tests/support/Support_Exec.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_Field.java b/support/src/test/java/tests/support/Support_Field.java
index 07863fe..36ff718 100644
--- a/support/src/test/java/tests/support/Support_Field.java
+++ b/support/src/test/java/tests/support/Support_Field.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@ public class Support_Field {
     protected double doubleField;
 
     /**
-     * 
+     *
      */
     public Support_Field() {
     }
diff --git a/support/src/test/java/tests/support/Support_Format.java b/support/src/test/java/tests/support/Support_Format.java
index 2e50959..d53a0ba 100644
--- a/support/src/test/java/tests/support/Support_Format.java
+++ b/support/src/test/java/tests/support/Support_Format.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -75,7 +75,7 @@ public class Support_Format extends TestCase {
     /**
      * finds attributes with regards to char index in this
      * AttributedCharacterIterator, and puts them in a vector
-     * 
+     *
      * @param iterator
      * @return a vector, each entry in this vector are of type FieldContainer ,
      *         which stores start and end indexes and an attribute this range
diff --git a/support/src/test/java/tests/support/Support_GetLocal.java b/support/src/test/java/tests/support/Support_GetLocal.java
index 2d7acf7..21f1efd 100644
--- a/support/src/test/java/tests/support/Support_GetLocal.java
+++ b/support/src/test/java/tests/support/Support_GetLocal.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_GetPutFields.java b/support/src/test/java/tests/support/Support_GetPutFields.java
index f191c01..3cf0d91 100644
--- a/support/src/test/java/tests/support/Support_GetPutFields.java
+++ b/support/src/test/java/tests/support/Support_GetPutFields.java
@@ -28,12 +28,12 @@ import java.io.IOException;
  * read them back from an input stream.
  */
 public class Support_GetPutFields implements Serializable {
-    
+
     private static final long serialVersionUID = 1L;
-    
+
     public ObjectInputStream.GetField getField;
     public ObjectOutputStream.PutField putField;
-    
+
     public boolean booleanValue = false;
     public byte byteValue = 0;
     public char charValue = 0;
@@ -45,34 +45,34 @@ public class Support_GetPutFields implements Serializable {
     public SimpleClass objectValue = null;
 
     class SimpleClass implements Serializable {
-    
+
         private static final long serialVersionUID = 1L;
         private int a;
         private String b;
-        
+
         public SimpleClass(int aValue, String bValue) {
             a = aValue;
             b = bValue;
         }
-        
+
         public int getA() {
             return a;
         }
-        
+
         public String getB() {
             return b;
         }
-        
+
         public boolean equals(Object obj) {
             if (obj == null || obj.getClass() != this.getClass()) {
                 return false;
             }
-            
+
             SimpleClass other = (SimpleClass) obj;
             return (a == other.getA() && b.equals(other.getB()));
         }
     }
-    
+
     public void initTestValues() {
         booleanValue = true;
         byteValue = (byte) 0xbe;
@@ -84,14 +84,14 @@ public class Support_GetPutFields implements Serializable {
         objectValue = new SimpleClass(1965, "Hello Mars");
         shortValue = 1234;
     }
-    
+
     public boolean equals(Object obj) {
         if (obj == null || obj.getClass() != this.getClass()) {
             return false;
         }
-        
+
         Support_GetPutFields other = (Support_GetPutFields) obj;
-        return (booleanValue == other.booleanValue && 
+        return (booleanValue == other.booleanValue &&
                 byteValue == other.byteValue &&
                 charValue == other.charValue &&
                 doubleValue == other.doubleValue &&
@@ -102,7 +102,7 @@ public class Support_GetPutFields implements Serializable {
                 shortValue == other.shortValue
                 );
     }
-    
+
     private void readObject(ObjectInputStream ois) throws Exception {
         getField = ois.readFields();
         booleanValue = getField.get("booleanValue", false);
@@ -112,11 +112,11 @@ public class Support_GetPutFields implements Serializable {
         floatValue = getField.get("floatValue", 0.0f);
         longValue = getField.get("longValue", (long) 0);
         intValue = getField.get("intValue", 0);
-        objectValue = (Support_GetPutFields.SimpleClass) 
+        objectValue = (Support_GetPutFields.SimpleClass)
                 getField.get("objectValue", (Object) null);
         shortValue = getField.get("shortValue", (short) 0);
     }
-    
+
     private void writeObject(ObjectOutputStream oos) throws IOException {
         putField = oos.putFields();
         putField.put("booleanValue", booleanValue);
diff --git a/support/src/test/java/tests/support/Support_GetPutFieldsDefaulted.java b/support/src/test/java/tests/support/Support_GetPutFieldsDefaulted.java
index b9a5e56..25b7417 100644
--- a/support/src/test/java/tests/support/Support_GetPutFieldsDefaulted.java
+++ b/support/src/test/java/tests/support/Support_GetPutFieldsDefaulted.java
@@ -39,12 +39,12 @@ import java.io.IOException;
  * </p>
  */
 public class Support_GetPutFieldsDefaulted implements Serializable {
-    
+
     private static final long serialVersionUID = 1L;
-    
+
     public ObjectInputStream.GetField getField;
     public ObjectOutputStream.PutField putField;
-    
+
     public boolean booleanValue = false;
     public byte byteValue = 0;
     public char charValue = 0;
@@ -56,34 +56,34 @@ public class Support_GetPutFieldsDefaulted implements Serializable {
     public SimpleClass objectValue = null;
 
     class SimpleClass implements Serializable {
-    
+
         private static final long serialVersionUID = 1L;
         private int a;
         private String b;
-        
+
         public SimpleClass(int aValue, String bValue) {
             a = aValue;
             b = bValue;
         }
-        
+
         public int getA() {
             return a;
         }
-        
+
         public String getB() {
             return b;
         }
-        
+
         public boolean equals(Object obj) {
             if (obj == null || obj.getClass() != this.getClass()) {
                 return false;
             }
-            
+
             SimpleClass other = (SimpleClass) obj;
             return (a == other.getA() && b.equals(other.getB()));
         }
     }
-    
+
     public void initTestValues() {
         booleanValue = true;
         byteValue = (byte) 0x0b;
@@ -95,14 +95,14 @@ public class Support_GetPutFieldsDefaulted implements Serializable {
         objectValue = new SimpleClass(1965, "Hello Jupiter");
         shortValue = 4321;
     }
-    
+
     public boolean equals(Object obj) {
         if (obj == null || obj.getClass() != this.getClass()) {
             return false;
         }
-        
+
         Support_GetPutFieldsDefaulted other = (Support_GetPutFieldsDefaulted) obj;
-        return (booleanValue == other.booleanValue && 
+        return (booleanValue == other.booleanValue &&
                 byteValue == other.byteValue &&
                 charValue == other.charValue &&
                 doubleValue == other.doubleValue &&
@@ -113,7 +113,7 @@ public class Support_GetPutFieldsDefaulted implements Serializable {
                 shortValue == other.shortValue
                 );
     }
-    
+
     private void readObject(ObjectInputStream ois) throws Exception {
         getField = ois.readFields();
         booleanValue = getField.get("booleanValue", true);
@@ -123,17 +123,17 @@ public class Support_GetPutFieldsDefaulted implements Serializable {
         floatValue = getField.get("floatValue", 298.54f);
         longValue = getField.get("longValue", (long) 1234567890l);
         intValue = getField.get("intValue", 999999);
-        objectValue = (Support_GetPutFieldsDefaulted.SimpleClass) 
-                       getField.get("objectValue", 
+        objectValue = (Support_GetPutFieldsDefaulted.SimpleClass)
+                       getField.get("objectValue",
                                     new SimpleClass(1965, "Hello Jupiter"));
         shortValue = getField.get("shortValue", (short) 4321);
     }
-    
+
     private void writeObject(ObjectOutputStream oos) throws IOException {
         putField = oos.putFields();
         // Do not put anything into putField so that the get methods
         // will have to use default values.
         oos.writeFields();
     }
-    
+
 }
diff --git a/support/src/test/java/tests/support/Support_GetPutFieldsDeprecated.java b/support/src/test/java/tests/support/Support_GetPutFieldsDeprecated.java
index 81fcef2..0f54e3e 100644
--- a/support/src/test/java/tests/support/Support_GetPutFieldsDeprecated.java
+++ b/support/src/test/java/tests/support/Support_GetPutFieldsDeprecated.java
@@ -30,12 +30,12 @@ import java.io.Serializable;
  * to the output stream.
  */
 public class Support_GetPutFieldsDeprecated implements Serializable {
-    
+
     private static final long serialVersionUID = 1L;
-    
+
     public ObjectInputStream.GetField getField;
     public ObjectOutputStream.PutField putField;
-    
+
     public boolean booleanValue = false;
     public byte byteValue = 0;
     public char charValue = 0;
@@ -47,34 +47,34 @@ public class Support_GetPutFieldsDeprecated implements Serializable {
     public SimpleClass objectValue = null;
 
     class SimpleClass implements Serializable {
-    
+
         private static final long serialVersionUID = 1L;
         private int a;
         private String b;
-        
+
         public SimpleClass(int aValue, String bValue) {
             a = aValue;
             b = bValue;
         }
-        
+
         public int getA() {
             return a;
         }
-        
+
         public String getB() {
             return b;
         }
-        
+
         public boolean equals(Object obj) {
             if (obj == null || obj.getClass() != this.getClass()) {
                 return false;
             }
-            
+
             SimpleClass other = (SimpleClass) obj;
             return (a == other.getA() && b.equals(other.getB()));
         }
     }
-    
+
     public void initTestValues() {
         booleanValue = true;
         byteValue = (byte) 0xbe;
@@ -86,14 +86,14 @@ public class Support_GetPutFieldsDeprecated implements Serializable {
         objectValue = new SimpleClass(2001, "A Space Odyssey");
         shortValue = 3078;
     }
-    
+
     public boolean equals(Object obj) {
         if (obj == null || obj.getClass() != this.getClass()) {
             return false;
         }
-        
+
         Support_GetPutFields other = (Support_GetPutFields) obj;
-        return (booleanValue == other.booleanValue && 
+        return (booleanValue == other.booleanValue &&
                 byteValue == other.byteValue &&
                 charValue == other.charValue &&
                 doubleValue == other.doubleValue &&
@@ -104,7 +104,7 @@ public class Support_GetPutFieldsDeprecated implements Serializable {
                 shortValue == other.shortValue
                 );
     }
-    
+
     private void readObject(ObjectInputStream ois) throws Exception {
         booleanValue = getField.get("booleanValue", false);
         byteValue = getField.get("byteValue", (byte) 0);
@@ -113,11 +113,11 @@ public class Support_GetPutFieldsDeprecated implements Serializable {
         floatValue = getField.get("floatValue", 0.0f);
         longValue = getField.get("longValue", (long) 0);
         intValue = getField.get("intValue", 0);
-        objectValue = (Support_GetPutFieldsDeprecated.SimpleClass) 
+        objectValue = (Support_GetPutFieldsDeprecated.SimpleClass)
                 getField.get("objectValue", (Object) null);
         shortValue = getField.get("shortValue", (short) 0);
     }
-    
+
     private void writeObject(ObjectOutputStream oos) throws IOException {
         putField = oos.putFields();
         putField.put("booleanValue", booleanValue);
diff --git a/support/src/test/java/tests/support/Support_GetResource.java b/support/src/test/java/tests/support/Support_GetResource.java
index cef4f8e..7cc2b88 100644
--- a/support/src/test/java/tests/support/Support_GetResource.java
+++ b/support/src/test/java/tests/support/Support_GetResource.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_IOTestSecurityManager.java b/support/src/test/java/tests/support/Support_IOTestSecurityManager.java
index 0876a50..557787a 100644
--- a/support/src/test/java/tests/support/Support_IOTestSecurityManager.java
+++ b/support/src/test/java/tests/support/Support_IOTestSecurityManager.java
@@ -24,20 +24,20 @@ import java.util.Iterator;
 
 public class Support_IOTestSecurityManager extends SecurityManager {
     private ArrayList<Permission> permissions;
-    
+
     public Support_IOTestSecurityManager() {
         permissions = new ArrayList<Permission>(2);
         permissions.add(new SerializablePermission("enableSubclassImplementation"));
         permissions.add(new SerializablePermission("enableSubstitution"));
     }
-    
+
     public void checkPermission(Permission p) {
         for (Iterator<Permission> i = permissions.iterator(); i.hasNext(); ) {
             if (i.next().equals(p)) {
                 throw new SecurityException();
             }
         }
-    }        
+    }
 }
 
 
diff --git a/support/src/test/java/tests/support/Support_ListTest.java b/support/src/test/java/tests/support/Support_ListTest.java
index 645a564..f9b7a21 100644
--- a/support/src/test/java/tests/support/Support_ListTest.java
+++ b/support/src/test/java/tests/support/Support_ListTest.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_MapTest2.java b/support/src/test/java/tests/support/Support_MapTest2.java
index 217b198..42b5cbf 100644
--- a/support/src/test/java/tests/support/Support_MapTest2.java
+++ b/support/src/test/java/tests/support/Support_MapTest2.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_MessageFormat.java b/support/src/test/java/tests/support/Support_MessageFormat.java
index 361144c..a2d787a 100644
--- a/support/src/test/java/tests/support/Support_MessageFormat.java
+++ b/support/src/test/java/tests/support/Support_MessageFormat.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_NetworkInterface.java b/support/src/test/java/tests/support/Support_NetworkInterface.java
index d801a26..dcdaf00 100644
--- a/support/src/test/java/tests/support/Support_NetworkInterface.java
+++ b/support/src/test/java/tests/support/Support_NetworkInterface.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_OutputStream.java b/support/src/test/java/tests/support/Support_OutputStream.java
index d729273..ce4fa0f 100644
--- a/support/src/test/java/tests/support/Support_OutputStream.java
+++ b/support/src/test/java/tests/support/Support_OutputStream.java
@@ -45,7 +45,7 @@ public class Support_OutputStream extends OutputStream {
         }
         super.close();
     }
-    
+
     @Override
     public void flush() throws IOException {
         if (throwsException) {
@@ -70,7 +70,7 @@ public class Support_OutputStream extends OutputStream {
             throw new IOException("Exception thrown for testing purposes.");
         }
         if (offset < 0 || count < 0 || (offset + count) > buffer.length) {
-            throw new IndexOutOfBoundsException(); 
+            throw new IndexOutOfBoundsException();
         }
         for (int i = offset; i < offset + count; i++) {
             write(buffer[i]);
@@ -99,7 +99,7 @@ public class Support_OutputStream extends OutputStream {
     public String toString() {
         return new String(buffer, 0, position);
     }
-    
+
     public int size() {
         return position;
     }
diff --git a/support/src/test/java/tests/support/Support_PlatformFile.java b/support/src/test/java/tests/support/Support_PlatformFile.java
index 78b03c5..1486b20 100644
--- a/support/src/test/java/tests/support/Support_PlatformFile.java
+++ b/support/src/test/java/tests/support/Support_PlatformFile.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_PortManager.java b/support/src/test/java/tests/support/Support_PortManager.java
index 81f5e8d..9d2fd86 100644
--- a/support/src/test/java/tests/support/Support_PortManager.java
+++ b/support/src/test/java/tests/support/Support_PortManager.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import java.util.TimeZone;
  * The port manager is supposed to help finding a free
  * network port on the machine; however, it uses strange
  * logic, so leave it to the OS.
- *  
+ *
  * @deprecated Use OS to find free ports.
  */
 public class Support_PortManager {
diff --git a/support/src/test/java/tests/support/Support_ProviderTrust.java b/support/src/test/java/tests/support/Support_ProviderTrust.java
index cf441e1..9c47e10 100644
--- a/support/src/test/java/tests/support/Support_ProviderTrust.java
+++ b/support/src/test/java/tests/support/Support_ProviderTrust.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ import java.security.Provider;
 
 /**
  * This class implements a dummy provider.
- * 
+ *
  */
 public class Support_ProviderTrust extends Provider {
     private static final long serialVersionUID = 1L;
@@ -39,7 +39,7 @@ public class Support_ProviderTrust extends Provider {
 
     /**
      * Constructs a new instance of the dummy provider.
-     * 
+     *
      */
     public Support_ProviderTrust() {
         super(NAME, VERSION, INFO);
diff --git a/support/src/test/java/tests/support/Support_Proxy_I1.java b/support/src/test/java/tests/support/Support_Proxy_I1.java
index 66296c9..367c8ac 100644
--- a/support/src/test/java/tests/support/Support_Proxy_I1.java
+++ b/support/src/test/java/tests/support/Support_Proxy_I1.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_Proxy_I2.java b/support/src/test/java/tests/support/Support_Proxy_I2.java
index e6e5394..f4b0dd1 100644
--- a/support/src/test/java/tests/support/Support_Proxy_I2.java
+++ b/support/src/test/java/tests/support/Support_Proxy_I2.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_Proxy_ParentException.java b/support/src/test/java/tests/support/Support_Proxy_ParentException.java
index 13ac4c0..cc15b81 100644
--- a/support/src/test/java/tests/support/Support_Proxy_ParentException.java
+++ b/support/src/test/java/tests/support/Support_Proxy_ParentException.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_Proxy_SubException.java b/support/src/test/java/tests/support/Support_Proxy_SubException.java
index 0d43630..95c23b4 100644
--- a/support/src/test/java/tests/support/Support_Proxy_SubException.java
+++ b/support/src/test/java/tests/support/Support_Proxy_SubException.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_SetTest.java b/support/src/test/java/tests/support/Support_SetTest.java
index 4325e19..cbea1d8 100644
--- a/support/src/test/java/tests/support/Support_SetTest.java
+++ b/support/src/test/java/tests/support/Support_SetTest.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_SimpleDateFormat.java b/support/src/test/java/tests/support/Support_SimpleDateFormat.java
index 9447aec..8b94c9c 100644
--- a/support/src/test/java/tests/support/Support_SimpleDateFormat.java
+++ b/support/src/test/java/tests/support/Support_SimpleDateFormat.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_StringReader.java b/support/src/test/java/tests/support/Support_StringReader.java
index f2d9a94..7ffcaa1 100644
--- a/support/src/test/java/tests/support/Support_StringReader.java
+++ b/support/src/test/java/tests/support/Support_StringReader.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@ public class Support_StringReader extends Reader {
      * Construct a StringReader on the String <code>str</code>. The size of
      * the reader is set to the <code>length()</code> of the String and the
      * Object to synchronize access through is set to <code>str</code>.
-     * 
+     *
      * @param str
      *            the String to filter reads on.
      */
@@ -47,7 +47,7 @@ public class Support_StringReader extends Reader {
      * This method closes this StringReader. Once it is closed, you can no
      * longer read from it. Only the first invocation of this method has any
      * effect.
-     * 
+     *
      */
     @Override
     public void close() {
@@ -69,10 +69,10 @@ public class Support_StringReader extends Reader {
      * Set a Mark position in this Reader. The parameter <code>readLimit</code>
      * is ignored for StringReaders. Sending reset() will reposition the reader
      * back to the marked position provided the mark has not been invalidated.
-     * 
+     *
      * @param readlimit
      *            ignored for StringReaders.
-     * 
+     *
      * @exception java.io.IOException
      *                If an error occurs attempting mark this StringReader.
      */
@@ -94,7 +94,7 @@ public class Support_StringReader extends Reader {
     /**
      * Answers a boolean indicating whether or not this StringReader supports
      * mark() and reset(). This method always returns true.
-     * 
+     *
      * @return <code>true</code> if mark() and reset() are supported,
      *         <code>false</code> otherwise. This implementation always
      *         returns <code>true</code>.
@@ -108,9 +108,9 @@ public class Support_StringReader extends Reader {
      * Reads a single character from this StringReader and returns the result as
      * an int. The 2 higher-order bytes are set to 0. If the end of reader was
      * encountered then return -1.
-     * 
+     *
      * @return the character read or -1 if end of reader.
-     * 
+     *
      * @exception java.io.IOException
      *                If the StringReader is already closed.
      */
@@ -132,7 +132,7 @@ public class Support_StringReader extends Reader {
      * stores them at <code>offset</code> in the character array
      * <code>buf</code>. Returns the number of characters actually read or -1
      * if the end of reader was encountered.
-     * 
+     *
      * @param buf
      *            character array to store the read characters
      * @param offset
@@ -140,7 +140,7 @@ public class Support_StringReader extends Reader {
      * @param count
      *            maximum number of characters to read
      * @return the number of characters read or -1 if end of reader.
-     * 
+     *
      * @exception java.io.IOException
      *                If the StringReader is closed.
      */
@@ -174,11 +174,11 @@ public class Support_StringReader extends Reader {
      * the result is <code>false</code> this Reader may or may not block when
      * <code>read()</code> is sent. The implementation in StringReader always
      * returns <code>true</code> even when it has been closed.
-     * 
+     *
      * @return <code>true</code> if the receiver will not block when
      *         <code>read()</code> is called, <code>false</code> if unknown
      *         or blocking will occur.
-     * 
+     *
      * @exception java.io.IOException
      *                If an IO error occurs.
      */
@@ -197,7 +197,7 @@ public class Support_StringReader extends Reader {
      * location. Invocations of <code>read()/skip()</code> will occur from
      * this new location. If this Reader was not marked, the StringReader is
      * reset to the beginning of the String.
-     * 
+     *
      * @exception java.io.IOException
      *                If this StringReader has already been closed.
      */
@@ -216,11 +216,11 @@ public class Support_StringReader extends Reader {
      * Skips <code>count</code> number of characters in this StringReader.
      * Subsequent <code>read()</code>'s will not return these characters
      * unless <code>reset()</code> is used.
-     * 
+     *
      * @param count
      *            The number of characters to skip.
      * @return the number of characters actually skipped.
-     * 
+     *
      * @exception java.io.IOException
      *                If this StringReader has already been closed.
      */
diff --git a/support/src/test/java/tests/support/Support_StringWriter.java b/support/src/test/java/tests/support/Support_StringWriter.java
index 348f547..29df03a 100644
--- a/support/src/test/java/tests/support/Support_StringWriter.java
+++ b/support/src/test/java/tests/support/Support_StringWriter.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@ public class Support_StringWriter extends Writer {
     /**
      * Close this Writer. This is the concrete implementation required. This
      * particular implementation does nothing.
-     * 
+     *
      * @exception java.io.IOException
      *                If an IO error occurs closing this StringWriter.
      */
@@ -62,7 +62,7 @@ public class Support_StringWriter extends Writer {
     /**
      * Flush this Writer. This is the concrete implementation required. This
      * particular implementation does nothing.
-     * 
+     *
      */
     @Override
     public void flush() {
@@ -72,7 +72,7 @@ public class Support_StringWriter extends Writer {
      * Answer the contents of this StringWriter as a StringBuffer. Any changes
      * made to the StringBuffer by the receiver or the caller are reflected in
      * this StringWriter.
-     * 
+     *
      * @return this StringWriters local StringBuffer.
      */
     public StringBuffer getBuffer() {
@@ -85,7 +85,7 @@ public class Support_StringWriter extends Writer {
      * Answer the contents of this StringWriter as a String. Any changes made to
      * the StringBuffer by the receiver after returning will not be reflected in
      * the String returned to the caller.
-     * 
+     *
      * @return this StringWriters current contents as a String.
      */
     @Override
@@ -98,14 +98,14 @@ public class Support_StringWriter extends Writer {
     /**
      * Writes <code>count</code> characters starting at <code>offset</code>
      * in <code>buf</code> to this StringWriter.
-     * 
+     *
      * @param buf
      *            the non-null array containing characters to write.
      * @param offset
      *            offset in buf to retrieve characters
      * @param count
      *            maximum number of characters to write
-     * 
+     *
      * @exception java.lang.ArrayIndexOutOfBoundsException
      *                If offset or count are outside of bounds.
      */
@@ -126,10 +126,10 @@ public class Support_StringWriter extends Writer {
      * Writes the specified character <code>oneChar</code> to this
      * StringWriter. This implementation writes the low order two bytes to the
      * Stream.
-     * 
+     *
      * @param oneChar
      *            The character to write
-     * 
+     *
      */
     @Override
     public void write(int oneChar) {
@@ -141,10 +141,10 @@ public class Support_StringWriter extends Writer {
     /**
      * Writes the characters from the String <code>str</code> to this
      * StringWriter.
-     * 
+     *
      * @param str
      *            the non-null String containing the characters to write.
-     * 
+     *
      */
     @Override
     public void write(String str) {
@@ -157,14 +157,14 @@ public class Support_StringWriter extends Writer {
      * Writes <code>count</code> number of characters starting at
      * <code>offset</code> from the String <code>str</code> to this
      * StringWriter.
-     * 
+     *
      * @param str
      *            the non-null String containing the characters to write.
      * @param offset
      *            the starting point to retrieve characters.
      * @param count
      *            the number of characters to retrieve and write.
-     * 
+     *
      * @exception java.lang.ArrayIndexOutOfBoundsException
      *                If offset or count are outside of bounds.
      */
diff --git a/support/src/test/java/tests/support/Support_TestProvider.java b/support/src/test/java/tests/support/Support_TestProvider.java
index 63e774a..0b5d319 100644
--- a/support/src/test/java/tests/support/Support_TestProvider.java
+++ b/support/src/test/java/tests/support/Support_TestProvider.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource.java b/support/src/test/java/tests/support/Support_TestResource.java
index 78637f8..11831f6 100644
--- a/support/src/test/java/tests/support/Support_TestResource.java
+++ b/support/src/test/java/tests/support/Support_TestResource.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource_en.java b/support/src/test/java/tests/support/Support_TestResource_en.java
index 4a69d7f..8001db0 100644
--- a/support/src/test/java/tests/support/Support_TestResource_en.java
+++ b/support/src/test/java/tests/support/Support_TestResource_en.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource_en_US.java b/support/src/test/java/tests/support/Support_TestResource_en_US.java
index 4d73675..59951f4 100644
--- a/support/src/test/java/tests/support/Support_TestResource_en_US.java
+++ b/support/src/test/java/tests/support/Support_TestResource_en_US.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource_fr.java b/support/src/test/java/tests/support/Support_TestResource_fr.java
index 8bc0829..4cc45cf 100644
--- a/support/src/test/java/tests/support/Support_TestResource_fr.java
+++ b/support/src/test/java/tests/support/Support_TestResource_fr.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource_fr_FR.java b/support/src/test/java/tests/support/Support_TestResource_fr_FR.java
index 59c56bd..a7f6122 100644
--- a/support/src/test/java/tests/support/Support_TestResource_fr_FR.java
+++ b/support/src/test/java/tests/support/Support_TestResource_fr_FR.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestResource_fr_FR_VAR.java b/support/src/test/java/tests/support/Support_TestResource_fr_FR_VAR.java
index b9f4d60..7db8ad5 100644
--- a/support/src/test/java/tests/support/Support_TestResource_fr_FR_VAR.java
+++ b/support/src/test/java/tests/support/Support_TestResource_fr_FR_VAR.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_TestWebData.java b/support/src/test/java/tests/support/Support_TestWebData.java
index b72fdfd..9fdd021 100644
--- a/support/src/test/java/tests/support/Support_TestWebData.java
+++ b/support/src/test/java/tests/support/Support_TestWebData.java
@@ -30,7 +30,7 @@ import java.util.Date;
 public class Support_TestWebData {
   public final static byte[] test1 = utfBytes();
   public final static byte[] test2 = newBinaryFile(8192);
-  
+
   private static byte[] utfBytes() {
     try {
       return "<html>\n<body>\n<h1>Hello World!</h1>\n</body>\n</html>\n".getBytes("UTF-8");
@@ -38,7 +38,7 @@ public class Support_TestWebData {
       throw new AssertionError();
     }
   }
-  
+
   private static byte[] newBinaryFile(int byteCount) {
     byte[] result = new byte[byteCount];
     for (int i = 0; i < result.length; ++i) {
@@ -46,10 +46,10 @@ public class Support_TestWebData {
     }
     return result;
   }
-  
+
   // string for test request post body
   public final static String postContent = "user=111";
-  
+
   // Array of all test data
   public final static byte[][] tests = {
     test1,
diff --git a/support/src/test/java/tests/support/Support_TimeZone.java b/support/src/test/java/tests/support/Support_TimeZone.java
index 750f98e..e9d2895 100644
--- a/support/src/test/java/tests/support/Support_TimeZone.java
+++ b/support/src/test/java/tests/support/Support_TimeZone.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@ import java.util.TimeZone;
 /**
  * Sample java.util.TimeZone subclass to test getDSTSavings() and getOffset(long)
  * APIs
- * 
+ *
  */
 public class Support_TimeZone extends TimeZone {
     private static final long serialVersionUID = 1L;
diff --git a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
index 0100c01..a07b9b4 100644
--- a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
+++ b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
index 6405701..464ee93 100644
--- a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
+++ b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/support/src/test/java/tests/support/Support_Xml.java b/support/src/test/java/tests/support/Support_Xml.java
index 03ed4a1..7e7702e 100644
--- a/support/src/test/java/tests/support/Support_Xml.java
+++ b/support/src/test/java/tests/support/Support_Xml.java
@@ -1,12 +1,12 @@
 /*
  * Copyright (C) 2009 The Android Open Source Project
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,23 +31,23 @@ public class Support_Xml {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setCoalescing(true);
         dbf.setExpandEntityReferences(true);
-        
+
         ByteArrayInputStream stream = new ByteArrayInputStream(xml.getBytes());
         DocumentBuilder builder = dbf.newDocumentBuilder();
-        
+
         return builder.parse(stream);
     }
-    
+
     public static String firstChildTextOf(Document doc) throws Exception {
         NodeList children = doc.getFirstChild().getChildNodes();
         assertEquals(1, children.getLength());
         return children.item(0).getNodeValue();
     }
-    
+
     public static Element firstElementOf(Document doc) throws Exception {
         return (Element) doc.getFirstChild();
     }
-    
+
     public static String attrOf(Element e) throws Exception {
         return e.getAttribute("attr");
     }
diff --git a/support/src/test/java/tests/support/resource/Support_Resources.java b/support/src/test/java/tests/support/resource/Support_Resources.java
index 67b6001..0bd0ccf 100644
--- a/support/src/test/java/tests/support/resource/Support_Resources.java
+++ b/support/src/test/java/tests/support/resource/Support_Resources.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -142,12 +142,12 @@ public class Support_Resources {
 
     /**
      * Util method to load resource files
-     * 
+     *
      * @param name - name of resource file
      * @return - resource input stream
      */
     public static InputStream getResourceStream(String name) {
-        
+
         InputStream is = Support_Resources.class.getResourceAsStream(name);
 
         if (is == null) {
@@ -157,13 +157,13 @@ public class Support_Resources {
                 throw new RuntimeException("Failed to load resource: " + name);
             }
         }
-        
+
         return is;
     }
 
     /**
      * Util method to write resource files directly to an OutputStream.
-     * 
+     *
      * @param name - name of resource file.
      * @param out - OutputStream to write to.
      * @return - number of bytes written to out.
@@ -188,7 +188,7 @@ public class Support_Resources {
 
     /**
      * Util method to get absolute path to resource file
-     * 
+     *
      * @param name - name of resource file
      * @return - path to resource
      */
diff --git a/support/src/test/java/tests/util/CallVerificationStack.java b/support/src/test/java/tests/util/CallVerificationStack.java
index 5646a77..6c1881b 100644
--- a/support/src/test/java/tests/util/CallVerificationStack.java
+++ b/support/src/test/java/tests/util/CallVerificationStack.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@ import java.util.Stack;
 
 /**
  * A stack to store the parameters of a call, as well as the call stack.
- * 
+ *
  */
 public class CallVerificationStack extends Stack<Object> {
 
@@ -66,7 +66,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Gets the singleton instance.
-     * 
+     *
      * @return the singleton instance
      */
     public static CallVerificationStack getInstance() {
@@ -89,7 +89,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Gets the "current" calling class name.
-     * 
+     *
      * @return the "current" calling class name
      */
     public String getCurrentSourceClass() {
@@ -98,7 +98,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Gets the "current" calling method name.
-     * 
+     *
      * @return the "current" calling method name
      */
     public String getCurrentSourceMethod() {
@@ -107,7 +107,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Clear the parameter stack and the call stack.
-     * 
+     *
      */
     @Override
     public void clear() {
@@ -123,7 +123,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a boolean onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -133,7 +133,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a char onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -143,7 +143,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a double onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -153,7 +153,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a float onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -163,7 +163,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes an int onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -173,7 +173,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a long onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -183,7 +183,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pushes a short onto the top of this stack.
-     * 
+     *
      * @param val
      *            the value to push
      */
@@ -193,7 +193,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop an object.
-     * 
+     *
      * @return the object
      */
     @Override
@@ -204,7 +204,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a boolean.
-     * 
+     *
      * @return the value
      */
     public boolean popBoolean() {
@@ -215,7 +215,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a char.
-     * 
+     *
      * @return the value
      */
     public char popChar() {
@@ -226,7 +226,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a double.
-     * 
+     *
      * @return the value
      */
     public double popDouble() {
@@ -237,7 +237,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a float.
-     * 
+     *
      * @return the value
      */
     public float popFloat() {
@@ -248,7 +248,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a int.
-     * 
+     *
      * @return the value
      */
     public int popInt() {
@@ -259,7 +259,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a long.
-     * 
+     *
      * @return the value
      */
     public long popLong() {
@@ -270,7 +270,7 @@ public class CallVerificationStack extends Stack<Object> {
 
     /**
      * Pop a short.
-     * 
+     *
      * @return the value
      */
     public short popShort() {
diff --git a/support/src/test/java/tests/util/FieldTestFileGenerator.java b/support/src/test/java/tests/util/FieldTestFileGenerator.java
index ea6acfd..f0079f6 100644
--- a/support/src/test/java/tests/util/FieldTestFileGenerator.java
+++ b/support/src/test/java/tests/util/FieldTestFileGenerator.java
@@ -28,7 +28,7 @@ import tests.support.Support_GetPutFieldsDefaulted;
  * Writes three test files that are used as reference in
  * {@code tests.api.java.io.ObjectInputStreamGetFieldTest} and
  * {@code tests.api.java.io.ObjectOutputStreamPutFieldTest}.
- * These files must be moved to 
+ * These files must be moved to
  * {@code $ANDROID_BUILD_TOP/dalvik/libcore/luni/src/test/resources/tests/api/java/io}
  * to be included at the correct location in the core tests package.
  * <p>
@@ -42,12 +42,12 @@ public class FieldTestFileGenerator {
         FileOutputStream fos = null;
         ObjectOutputStream oos = null;
         Support_GetPutFields toSerialize = new Support_GetPutFields();
-        Support_GetPutFieldsDeprecated toSerializeDeprecated = 
+        Support_GetPutFieldsDeprecated toSerializeDeprecated =
                 new Support_GetPutFieldsDeprecated();
-        Support_GetPutFieldsDefaulted toSerializeDefaulted = 
+        Support_GetPutFieldsDefaulted toSerializeDefaulted =
                 new Support_GetPutFieldsDefaulted();
         boolean success = true;
-        
+
         toSerialize.initTestValues();
         toSerializeDeprecated.initTestValues();
         toSerializeDefaulted.initTestValues();
@@ -66,7 +66,7 @@ public class FieldTestFileGenerator {
         finally {
             if (fos != null) fos.close();
         }
-        
+
         System.out.println("Trying to write the test file 'testFieldsDeprecated.ser'...");
         try {
             fos = new FileOutputStream("testFieldsDeprecated.ser");
@@ -77,11 +77,11 @@ public class FieldTestFileGenerator {
         catch (Exception e) {
             System.out.println("Exception occured while writing the file: " + e);
             success = false;
-        }       
+        }
         finally {
             if (fos != null) fos.close();
         }
-        
+
         System.out.println("Trying to write the test file 'testFieldsDefaulted.ser'...");
         try {
             fos = new FileOutputStream("testFieldsDefaulted.ser");
@@ -92,12 +92,12 @@ public class FieldTestFileGenerator {
         catch (Exception e) {
             System.out.println("Exception occured while writing the file: " + e);
             success = false;
-        }       
+        }
         finally {
             if (fos != null) fos.close();
         }
 
-        if (success) { 
+        if (success) {
             System.out.println("Success!");
         } else {
             System.out.println("Failure!");
diff --git a/support/src/test/java/tests/util/SerializationTester.java b/support/src/test/java/tests/util/SerializationTester.java
index c69d591..e67529b 100644
--- a/support/src/test/java/tests/util/SerializationTester.java
+++ b/support/src/test/java/tests/util/SerializationTester.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ import java.net.URL;
 
 /**
  * This class simplifies the serialization test.
- * 
+ *
  */
 public class SerializationTester {
 
@@ -61,7 +61,7 @@ public class SerializationTester {
 
     /**
      * Serialize an object and then deserialize it.
-     * 
+     *
      * @param inputObject
      *            the input object
      * @return the deserialized object
@@ -83,7 +83,7 @@ public class SerializationTester {
 
     /**
      * Tests the serialization and deserialization of const objects.
-     * 
+     *
      * @param inputObject
      *            A const object
      * @return true if the deserialized object is the same as the input object,
@@ -97,7 +97,7 @@ public class SerializationTester {
 
     /**
      * Tests the serialization and deserialization of instance objects.
-     * 
+     *
      * @param inputObject
      *            An object
      * @return true if the deserialized object is equal to the input object,
@@ -111,7 +111,7 @@ public class SerializationTester {
 
     /**
      * Tests the serialization compatibility with reference const objects.
-     * 
+     *
      * @param obj
      *            the object to be checked
      * @param fileName
@@ -128,7 +128,7 @@ public class SerializationTester {
     /**
      * Tests the serialization compatibility with reference for instance
      * objects.
-     * 
+     *
      * @param obj
      *            the object to be checked
      * @param fileName
@@ -144,7 +144,7 @@ public class SerializationTester {
 
     /**
      * Deserialize an object from a file.
-     * 
+     *
      * @param obj
      *            the object to be serialized if no serialization file is found
      * @param fileName
@@ -190,7 +190,7 @@ public class SerializationTester {
 
     /*
      * Creates a serialization output.
-     * 
+     *
      * @param obj the object to be serialized @param fileName the output file
      * @throws Exception If any occurs.
      */
@@ -231,7 +231,7 @@ public class SerializationTester {
 
     /**
      * Gets the last deserialized object.
-     * 
+     *
      * @return the last deserialized object
      */
     public static Object getLastOutput() {