2011-01-14 Basile Starynkevitch <basile@starynkevitch.net>

        MELT branch merged with trunk rev 168776



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@168777 138bc75d-0d04-0410-961f-82ee72b054a4

16 files changed, 48 insertions, 48 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java b/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
index 653957ec619..3526ad612c2 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
@@ -1,4 +1,4 @@
-/* Anubis.java -- 
+/* Anubis.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -315,7 +315,7 @@ public final class Anubis
   /**
    * Expands a user-supplied key material into a session key for a designated
    * <i>block size</i>.
-   * 
+   *
    * @param uk the 32N-bit user-supplied key material; 4 &lt;= N &lt;= 10.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
index bae142a638d..45aa2d6fd25 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
@@ -1,4 +1,4 @@
-/* BaseCipher.java -- 
+/* BaseCipher.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public abstract class BaseCipher
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name prefix of this instance.
    * @param defaultBlockSize the default block size in bytes.
    * @param defaultKeySize the default key size in bytes.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java b/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
index 68722e913c4..0c6d9b12b41 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
@@ -1,4 +1,4 @@
-/* Blowfish.java -- 
+/* Blowfish.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java b/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
index a7521530ce0..47b29226f7a 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
@@ -1,4 +1,4 @@
-/* Cast5.java -- 
+/* Cast5.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java b/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
index d6bb42253b8..fc902362674 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
@@ -1,4 +1,4 @@
-/* CipherFactory.java -- 
+/* CipherFactory.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,7 +58,7 @@ public class CipherFactory
 
   /**
    * Returns an instance of a block cipher given its name.
-   * 
+   *
    * @param name the case-insensitive name of the symmetric-key block cipher
    *          algorithm.
    * @return an instance of the designated cipher algorithm, or
@@ -107,7 +107,7 @@ public class CipherFactory
   /**
    * Returns a {@link Set} of symmetric key block cipher implementation names
    * supported by this <i>Factory</i>.
-   * 
+   *
    * @return a {@link Set} of block cipher names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/DES.java b/libjava/classpath/gnu/javax/crypto/cipher/DES.java
index 3ced62c3f40..ce538b75a9e 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/DES.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/DES.java
@@ -1,4 +1,4 @@
-/* DES.java -- 
+/* DES.java --
    Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -204,7 +204,7 @@ public class DES
   /**
    * Weak keys (parity adjusted): If all the bits in each half are either 0
    * or 1, then the key used for any cycle of the algorithm is the same as
-   * all other cycles. 
+   * all other cycles.
    */
   public static final byte[][] WEAK_KEYS = {
       Util.toBytesFromString("0101010101010101"),
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
index d1e32ef6599..86f8b34e05d 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
@@ -1,4 +1,4 @@
-/* IBlockCipher.java -- 
+/* IBlockCipher.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -88,21 +88,21 @@ public interface IBlockCipher
 
   /**
    * Returns the canonical name of this instance.
-   * 
+   *
    * @return the canonical name of this instance.
    */
   String name();
 
   /**
    * Returns the default value, in bytes, of the algorithm's block size.
-   * 
+   *
    * @return the default value, in bytes, of the algorithm's block size.
    */
   int defaultBlockSize();
 
   /**
    * Returns the default value, in bytes, of the algorithm's key size.
-   * 
+   *
    * @return the default value, in bytes, of the algorithm's key size.
    */
   int defaultKeySize();
@@ -110,7 +110,7 @@ public interface IBlockCipher
   /**
    * Returns an {@link Iterator} over the supported block sizes. Each element
    * returned by this object is an {@link Integer}.
-   * 
+   *
    * @return an {@link Iterator} over the supported block sizes.
    */
   Iterator blockSizes();
@@ -118,14 +118,14 @@ public interface IBlockCipher
   /**
    * Returns an {@link Iterator} over the supported key sizes. Each element
    * returned by this object is an {@link Integer}.
-   * 
+   *
    * @return an {@link Iterator} over the supported key sizes.
    */
   Iterator keySizes();
 
   /**
    * Returns a clone of this instance.
-   * 
+   *
    * @return a clone copy of this instance.
    */
   Object clone();
@@ -133,7 +133,7 @@ public interface IBlockCipher
   /**
    * Initialises the algorithm with designated attributes. Permissible names and
    * values are described in the class documentation above.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @exception InvalidKeyException if the key data is invalid.
@@ -145,7 +145,7 @@ public interface IBlockCipher
 
   /**
    * Returns the currently set block size for this instance.
-   * 
+   *
    * @return the current block size for this instance.
    * @exception IllegalStateException if the instance is not initialised.
    */
@@ -159,7 +159,7 @@ public interface IBlockCipher
 
   /**
    * Encrypts exactly one block of plaintext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of <code>in</code> from which to start considering
    *          data.
@@ -172,7 +172,7 @@ public interface IBlockCipher
 
   /**
    * Decrypts exactly one block of ciphertext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of <code>in</code> from which to start considering
    *          data.
@@ -187,7 +187,7 @@ public interface IBlockCipher
    * A <i>correctness</i> test that consists of basic symmetric encryption /
    * decryption test(s) for all supported block and key sizes, as well as one
    * (1) variable key Known Answer Test (KAT).
-   * 
+   *
    * @return <code>true</code> if the implementation passes simple
    *         <i>correctness</i> tests. Returns <code>false</code> otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
index 1023b12d812..9b217215868 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
@@ -1,4 +1,4 @@
-/* IBlockCipherSpi.java -- 
+/* IBlockCipherSpi.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ interface IBlockCipherSpi
   /**
    * Returns an {@link Iterator} over the supported block sizes. Each element
    * returned by this object is a {@link java.lang.Integer}.
-   * 
+   *
    * @return an <code>Iterator</code> over the supported block sizes.
    */
   Iterator blockSizes();
@@ -59,7 +59,7 @@ interface IBlockCipherSpi
   /**
    * Returns an {@link Iterator} over the supported key sizes. Each element
    * returned by this object is a {@link java.lang.Integer}.
-   * 
+   *
    * @return an <code>Iterator</code> over the supported key sizes.
    */
   Iterator keySizes();
@@ -67,7 +67,7 @@ interface IBlockCipherSpi
   /**
    * Expands a user-supplied key material into a session key for a designated
    * <i>block size</i>.
-   * 
+   *
    * @param k the user-supplied key material.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
@@ -78,7 +78,7 @@ interface IBlockCipherSpi
 
   /**
    * Encrypts exactly one block of plaintext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of <code>in</code> from which to start considering
    *          data.
@@ -96,7 +96,7 @@ interface IBlockCipherSpi
 
   /**
    * Decrypts exactly one block of ciphertext.
-   * 
+   *
    * @param in the ciphertext.
    * @param inOffset index of <code>in</code> from which to start considering
    *          data.
@@ -116,7 +116,7 @@ interface IBlockCipherSpi
    * A <i>correctness</i> test that consists of basic symmetric encryption /
    * decryption test(s) for all supported block and key sizes, as well as one
    * (1) variable key Known Answer Test (KAT).
-   * 
+   *
    * @return <code>true</code> if the implementation passes simple
    *         <i>correctness</i> tests. Returns <code>false</code> otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java b/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
index 491301f5aad..55e42628bac 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
@@ -1,4 +1,4 @@
-/* Khazad.java -- 
+/* Khazad.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -317,7 +317,7 @@ public final class Khazad
   /**
    * Expands a user-supplied key material into a session key for a designated
    * <i>block size</i>.
-   * 
+   *
    * @param uk the 128-bit user-supplied key material.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
index 4515559549b..f23ea489f3f 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
@@ -1,4 +1,4 @@
-/* NullCipher.java -- 
+/* NullCipher.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java b/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
index d1bc958c323..0463fe51de9 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
@@ -1,4 +1,4 @@
-/* Rijndael.java -- 
+/* Rijndael.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -305,7 +305,7 @@ public final class Rijndael
 
   /**
    * Returns the number of rounds for a given Rijndael's key and block sizes.
-   * 
+   *
    * @param ks the size of the user key material in bytes.
    * @param bs the desired block size in bytes.
    * @return the number of rounds for a given Rijndael's key and block sizes.
@@ -591,7 +591,7 @@ public final class Rijndael
   /**
    * Expands a user-supplied key material into a session key for a designated
    * <i>block size</i>.
-   * 
+   *
    * @param k the 128/192/256-bit user-key to use.
    * @param bs the block size in bytes of this Rijndael.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java b/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
index 636e311e7ee..1175fcfd2c4 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
@@ -1,4 +1,4 @@
-/* Serpent.java -- 
+/* Serpent.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Square.java b/libjava/classpath/gnu/javax/crypto/cipher/Square.java
index af738da043a..231df0a47e1 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Square.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Square.java
@@ -1,4 +1,4 @@
-/* Square.java -- 
+/* Square.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -271,7 +271,7 @@ public final class Square
 
   /**
    * Left rotate a 32-bit chunk.
-   * 
+   *
    * @param x the 32-bit data to rotate
    * @param s number of places to left-rotate by
    * @return the newly permutated value.
@@ -283,7 +283,7 @@ public final class Square
 
   /**
    * Right rotate a 32-bit chunk.
-   * 
+   *
    * @param x the 32-bit data to rotate
    * @param s number of places to right-rotate by
    * @return the newly permutated value.
@@ -299,7 +299,7 @@ public final class Square
    * Field in GF(2**8).
    * <p>
    * For best performance call it with abs(b) &lt; abs(a).
-   * 
+   *
    * @param a operand for multiply.
    * @param b operand for multiply.
    * @return the result of (a * b) % ROOT.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java b/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
index 1e98bfc8342..1d684c20a45 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
@@ -1,4 +1,4 @@
-/* TripleDES.java -- 
+/* TripleDES.java --
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -96,7 +96,7 @@ public class TripleDES
   /**
    * Convenience method which calls the method with same name and three
    * arguments, passing <code>3</code> as the value of the first parameter.
-   * 
+   *
    * @param kb The key bytes to adjust.
    * @param offset The starting offset into the key bytes.
    */
@@ -108,7 +108,7 @@ public class TripleDES
   /**
    * Adjusts, in-situ, the parity of the designated bytes, so they can be used
    * as DES keys for a 3-DES 1-, 2- or 3-key cipher.
-   * 
+   *
    * @param keyCount the number of independent DES keys. Can be either
    *          <code>1</code>, <code>2</code> or <code>3</code>. Any other value
    *          will cause an {@link IllegalArgumentException} to be raised.
@@ -133,7 +133,7 @@ public class TripleDES
   /**
    * Convenience method which calls the method with same name and three
    * arguments, passing <code>3</code> as the value of the first parameter.
-   * 
+   *
    * @param kb The key bytes to test.
    * @param offset The starting offset into the key bytes.
    * @return <code>true</code> if the bytes in <i>kb</i> starting at
@@ -150,7 +150,7 @@ public class TripleDES
    * Tests if enough bytes, expected to be used as DES keys for a 3-DES 1-, 2-
    * or 3-key cipher, located in a designated byte array, has already been
    * parity adjusted.
-   * 
+   *
    * @param keyCount the number of independent DES keys. Can be either
    *          <code>1</code>, <code>2</code> or <code>3</code>. Any other value
    *          will cause an {@link IllegalArgumentException} to be raised.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java b/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
index b6932442897..c9789a69935 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
@@ -1,4 +1,4 @@
-/* Twofish.java -- 
+/* Twofish.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java b/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
index f89ff54d1ca..e12f899e403 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
@@ -1,4 +1,4 @@
-/* WeakKeyException.java -- 
+/* WeakKeyException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.