1 files changed, 28 insertions, 51 deletions

diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
index 2be79165f18..b5e059c20e0 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
@@ -44,53 +44,41 @@ import gnu.java.security.sig.ISignatureCodec;
 import java.io.ByteArrayOutputStream;
 
 /**
- * <p>An object that implements the {@link gnu.crypto.sig.ISignatureCodec}
- * operations for the <i>Raw</i> format to use with RSA-PSS signatures.</p>
+ * An object that implements the {@link ISignatureCodec} operations for the
+ * <i>Raw</i> format to use with RSA-PSS signatures.
  */
-public class RSAPSSSignatureRawCodec implements ISignatureCodec
+public class RSAPSSSignatureRawCodec
+    implements ISignatureCodec
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   // implicit 0-arguments constructor
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.keys.IKeyPairCodec interface implementation
-  // -------------------------------------------------------------------------
-
   public int getFormatID()
   {
     return RAW_FORMAT;
   }
 
   /**
-   * <p>Returns the encoded form of the designated RSA-PSS signature object
-   * according to the <i>Raw</i> format supported by this library.</p>
-   *
-   * <p>The <i>Raw</i> format for an RSA-PSS signature, in this implementation,
-   * is a byte sequence consisting of the following:</p>
-   *
+   * Returns the encoded form of the designated RSA-PSS signature object
+   * according to the <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for an RSA-PSS signature, in this implementation, is
+   * a byte sequence consisting of the following:
    * <ol>
-   *		<li>4-byte magic consisting of the value of the literal
-   *    {@link Registry#MAGIC_RAW_RSA_PSS_SIGNATURE},<li>
-   *		<li>1-byte version consisting of the constant: 0x01,</li>
-   *		<li>4-byte count of following bytes representing the RSA-PSS signature
-   *    bytes in internet order,</li>
-   *		<li>the RSA-PSS signature bytes in internet order.</li>
+   * <li>4-byte magic consisting of the value of the literal
+   * {@link Registry#MAGIC_RAW_RSA_PSS_SIGNATURE},
+   * <li>
+   * <li>1-byte version consisting of the constant: 0x01,</li>
+   * <li>4-byte count of following bytes representing the RSA-PSS signature
+   * bytes in internet order,</li>
+   * <li>the RSA-PSS signature bytes in internet order.</li>
    * </ol>
-   *
+   * 
    * @param signature the signature to encode, consisting of the output of the
-   * <code>sign()</code> method of a {@link RSAPSSSignature} instance --a byte
-   * array.
+   *          <code>sign()</code> method of a {@link RSAPSSSignature} instance
+   *          --a byte array.
    * @return the <i>Raw</i> format encoding of the designated signature.
    * @exception IllegalArgumentException if the designated signature is not an
-   * RSA-PSS one.
+   *              RSA-PSS one.
    */
   public byte[] encodeSignature(Object signature)
   {
@@ -101,28 +89,23 @@ public class RSAPSSSignatureRawCodec implements ISignatureCodec
       }
     catch (Exception x)
       {
-        throw new IllegalArgumentException("key");
+        throw new IllegalArgumentException("signature");
       }
-
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[0]);
     baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[1]);
     baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[2]);
     baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[3]);
-
     // version
     baos.write(0x01);
-
     // signature bytes
     int length = buffer.length;
-    baos.write(length >>> 24);
+    baos.write( length >>> 24);
     baos.write((length >>> 16) & 0xFF);
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -133,25 +116,19 @@ public class RSAPSSSignatureRawCodec implements ISignatureCodec
         || k[1] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[1]
         || k[2] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[2]
         || k[3] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[3])
-      {
-        throw new IllegalArgumentException("magic");
-      }
-
+      throw new IllegalArgumentException("magic");
     // version
     if (k[4] != 0x01)
-      {
-        throw new IllegalArgumentException("version");
-      }
-
+      throw new IllegalArgumentException("version");
     int i = 5;
     int l;
-
     // signature bytes
-    l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
-        | (k[i++] & 0xFF);
+    l =  k[i++]         << 24
+      | (k[i++] & 0xFF) << 16
+      | (k[i++] & 0xFF) << 8
+      | (k[i++] & 0xFF);
     byte[] result = new byte[l];
     System.arraycopy(k, i, result, 0, l);
-
     return result;
   }
 }