Imported GNU Classpath 0.92

2006-08-14  Mark Wielaard  <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.

From-SVN: r116139

1 files changed, 89 insertions, 121 deletions

diff --git a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
index fb7cea99edd..c2650e6a49c 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
@@ -47,80 +47,60 @@ import java.security.PrivateKey;
 import java.security.PublicKey;
 
 /**
- * <p>An object that implements the {@link IKeyPairCodec} interface for the
- * <i>Raw</i> format to use with RSA keypairs.</p>
- *
- * @version $Revision: 1.1 $
+ * An object that implements the {@link IKeyPairCodec} interface for the <i>Raw</i>
+ * format to use with RSA keypairs.
  */
-public class RSAKeyPairRawCodec implements IKeyPairCodec
+public class RSAKeyPairRawCodec
+    implements IKeyPairCodec
 {
-
-  // Constants and variables
-  // -------------------------------------------------------------------------
-
-  // Constructor(s)
-  // -------------------------------------------------------------------------
-
   // implicit 0-arguments constructor
 
-  // Class methods
-  // -------------------------------------------------------------------------
-
-  // Instance methods
-  // -------------------------------------------------------------------------
-
-  // gnu.crypto.key.IKeyPairCodec interface implementation -------------------
-
   public int getFormatID()
   {
     return RAW_FORMAT;
   }
 
   /**
-   * <p>Returns the encoded form of the designated RSA public key according to
-   * the <i>Raw</i> format supported by this library.</p>
-   *
-   * <p>The <i>Raw</i> format for an RSA public key, in this implementation, is
-   * a byte sequence consisting of the following:</p>
-   *
+   * Returns the encoded form of the designated RSA public key according to the
+   * <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for an RSA public key, 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_PUBLIC_KEY},<li>
-   *		<li>1-byte version consisting of the constant: 0x01,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>n</code> (the modulus) in internet order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>n</code>,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>e</code> (the public exponent) in internet order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>e</code>.</li>
+   * <li>4-byte magic consisting of the value of the literal
+   * {@link Registry#MAGIC_RAW_RSA_PUBLIC_KEY},</li>
+   * <li>1-byte version consisting of the constant: 0x01,</li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>n</code> (the modulus) in internet order,</li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>n</code>,
+   * </li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>e</code> (the public exponent) in internet order,</li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>e</code>.
+   * </li>
    * </ol>
-   *
+   * 
    * @param key the key to encode.
    * @return the <i>Raw</i> format encoding of the designated key.
    * @exception IllegalArgumentException if the designated key is not an RSA
-   * one.
+   *              one.
    */
   public byte[] encodePublicKey(PublicKey key)
   {
-    if (!(key instanceof GnuRSAPublicKey))
-      {
-        throw new IllegalArgumentException("key");
-      }
+    if (! (key instanceof GnuRSAPublicKey))
+      throw new IllegalArgumentException("key");
 
     GnuRSAPublicKey rsaKey = (GnuRSAPublicKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[0]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[1]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[2]);
     baos.write(Registry.MAGIC_RAW_RSA_PUBLIC_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // n
     byte[] buffer = rsaKey.getModulus().toByteArray();
     int length = buffer.length;
@@ -129,7 +109,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // e
     buffer = rsaKey.getPublicExponent().toByteArray();
     length = buffer.length;
@@ -138,7 +117,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -149,92 +127,87 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
         || k[1] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[1]
         || k[2] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[2]
         || k[3] != Registry.MAGIC_RAW_RSA_PUBLIC_KEY[3])
-      {
-        throw new IllegalArgumentException("magic");
-      }
+      throw new IllegalArgumentException("magic");
 
     // version
     if (k[4] != 0x01)
-      {
-        throw new IllegalArgumentException("version");
-      }
-    int i = 5;
+      throw new IllegalArgumentException("version");
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // n
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger n = new BigInteger(1, buffer);
-
     // e
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger e = new BigInteger(1, buffer);
-
     return new GnuRSAPublicKey(n, e);
   }
 
   /**
-   * <p>Returns the encoded form of the designated RSA private key according to
-   * the <i>Raw</i> format supported by this library.</p>
-   *
-   * <p>The <i>Raw</i> format for an RSA private key, in this implementation,
-   * is a byte sequence consisting of the following:</p>
-   *
+   * Returns the encoded form of the designated RSA private key according to the
+   * <i>Raw</i> format supported by this library.
+   * <p>
+   * The <i>Raw</i> format for an RSA private key, 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_PRIVATE_KEY},<li>
-   *		<li>1-byte version consisting of the constant: 0x01,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>p</code> (the first prime factor of the modulus) in internet
-   *    order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>p</code>,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>q</code> (the second prime factor of the modulus) in internet
-   *    order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>q</code>,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>e</code> (the public exponent) in internet order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>e</code>,</li>
-   *		<li>4-byte count of following bytes representing the RSA parameter
-   *		<code>d</code> (the private exponent) in internet order,</li>
-   *		<li>n-bytes representation of a {@link BigInteger} obtained by invoking
-   *    the <code>toByteArray()</code> method on the RSA parameter <code>d</code>,</li>
+   * <li>4-byte magic consisting of the value of the literal
+   * {@link Registry#MAGIC_RAW_RSA_PRIVATE_KEY},</li>
+   * <li>1-byte version consisting of the constant: 0x01,</li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>p</code> (the first prime factor of the modulus) in internet order,
+   * </li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>p</code>,
+   * </li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>q</code> (the second prime factor of the modulus) in internet
+   * order,</li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>q</code>,
+   * </li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>e</code> (the public exponent) in internet order,</li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>e</code>,
+   * </li>
+   * <li>4-byte count of following bytes representing the RSA parameter
+   * <code>d</code> (the private exponent) in internet order,</li>
+   * <li>n-bytes representation of a {@link BigInteger} obtained by invoking
+   * the <code>toByteArray()</code> method on the RSA parameter <code>d</code>,
+   * </li>
    * </ol>
-   *
+   * 
    * @param key the key to encode.
    * @return the <i>Raw</i> format encoding of the designated key.
    */
   public byte[] encodePrivateKey(PrivateKey key)
   {
-    if (!(key instanceof GnuRSAPrivateKey))
-      {
-        throw new IllegalArgumentException("key");
-      }
+    if (! (key instanceof GnuRSAPrivateKey))
+      throw new IllegalArgumentException("key");
 
     GnuRSAPrivateKey rsaKey = (GnuRSAPrivateKey) key;
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
     // magic
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[0]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[1]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[2]);
     baos.write(Registry.MAGIC_RAW_RSA_PRIVATE_KEY[3]);
-
     // version
     baos.write(0x01);
-
     // p
     byte[] buffer = rsaKey.getPrimeP().toByteArray();
     int length = buffer.length;
@@ -243,7 +216,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // q
     buffer = rsaKey.getPrimeQ().toByteArray();
     length = buffer.length;
@@ -252,7 +224,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // e
     buffer = rsaKey.getPublicExponent().toByteArray();
     length = buffer.length;
@@ -261,7 +232,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     // d
     buffer = rsaKey.getPrivateExponent().toByteArray();
     length = buffer.length;
@@ -270,7 +240,6 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
     baos.write((length >>> 8) & 0xFF);
     baos.write(length & 0xFF);
     baos.write(buffer, 0, length);
-
     return baos.toByteArray();
   }
 
@@ -281,52 +250,51 @@ public class RSAKeyPairRawCodec implements IKeyPairCodec
         || k[1] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[1]
         || k[2] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[2]
         || k[3] != Registry.MAGIC_RAW_RSA_PRIVATE_KEY[3])
-      {
-        throw new IllegalArgumentException("magic");
-      }
+      throw new IllegalArgumentException("magic");
 
     // version
     if (k[4] != 0x01)
-      {
-        throw new IllegalArgumentException("version");
-      }
-    int i = 5;
+      throw new IllegalArgumentException("version");
 
+    int i = 5;
     int l;
     byte[] buffer;
-
     // p
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger p = new BigInteger(1, buffer);
-
     // q
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger q = new BigInteger(1, buffer);
-
     // e
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger e = new BigInteger(1, buffer);
-
     // d
-    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);
     buffer = new byte[l];
     System.arraycopy(k, i, buffer, 0, l);
     i += l;
     BigInteger d = new BigInteger(1, buffer);
-
     return new GnuRSAPrivateKey(p, q, e, d);
   }
 }