yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported GNU Classpath 0.92

Browse Source 
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
This commit is contained in:
Mark Wielaard
2006-08-14 23:12:35 +00:00
parent abab460491
commit ac1ed908de
1294 changed files with 99479 additions and 35933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/classpath/gnu/java/security/util/Base64.java
+95 -142
View File
@@ -38,8 +38,10 @@ exception statement from your version. */
package gnu.java.security.util;
import java.io.PrintWriter;
import gnu.java.security.Configuration;
import java.io.UnsupportedEncodingException;
import java.util.logging.Logger;
/**
* Most of this implementation is from Robert Harder's public domain Base64
@@ -47,25 +49,7 @@ import java.io.UnsupportedEncodingException;
*/
public class Base64
{
// Debugging methods and variables
// -------------------------------------------------------------------------
private static final String NAME = "Base64";
private static final boolean DEBUG = true;
private static final int debuglevel = 9;
private static final PrintWriter err = new PrintWriter(System.out, true);
private static void debug(String s)
{
err.println(">>> " + NAME + ": " + s);
}
// Constants and variables
// -------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(Base64.class.getName());
/** Maximum line length (76) of Base64 output. */
private static final int MAX_LINE_LENGTH = 76;
@@ -81,79 +65,58 @@ public class Base64
private static final byte EQUALS_SIGN_ENC = -1; // equals sign in encoding
/** The 64 valid Base64 values. */
private static final byte[] ALPHABET = { (byte) 'A', (byte) 'B', (byte) 'C',
(byte) 'D', (byte) 'E', (byte) 'F',
(byte) 'G', (byte) 'H', (byte) 'I',
(byte) 'J', (byte) 'K', (byte) 'L',
(byte) 'M', (byte) 'N', (byte) 'O',
(byte) 'P', (byte) 'Q', (byte) 'R',
(byte) 'S', (byte) 'T', (byte) 'U',
(byte) 'V', (byte) 'W', (byte) 'X',
(byte) 'Y', (byte) 'Z', (byte) 'a',
(byte) 'b', (byte) 'c', (byte) 'd',
(byte) 'e', (byte) 'f', (byte) 'g',
(byte) 'h', (byte) 'i', (byte) 'j',
(byte) 'k', (byte) 'l', (byte) 'm',
(byte) 'n', (byte) 'o', (byte) 'p',
(byte) 'q', (byte) 'r', (byte) 's',
(byte) 't', (byte) 'u', (byte) 'v',
(byte) 'w', (byte) 'x', (byte) 'y',
(byte) 'z', (byte) '0', (byte) '1',
(byte) '2', (byte) '3', (byte) '4',
(byte) '5', (byte) '6', (byte) '7',
(byte) '8', (byte) '9', (byte) '+',
(byte) '/' };
private static final byte[] ALPHABET = {
(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F',
(byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L',
(byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R',
(byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X',
(byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd',
(byte) 'e', (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j',
(byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o', (byte) 'p',
(byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', (byte) 'v',
(byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1',
(byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7',
(byte) '8', (byte) '9', (byte) '+', (byte) '/'
};
/**
* Translates a Base64 value to either its 6-bit reconstruction value or a
* negative number indicating some other meaning.
*/
private static final byte[] DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8
-5, -5, // Whitespace: Tab and Linefeed
-9, -9, // Decimal 11 - 12
-5, // Whitespace: Carriage Return
-9, -9, -9, -9, -9, -9, -9, -9, -9,
-9, -9, -9, -9, // Decimal 14 - 26
-9, -9, -9, -9, -9, // Decimal 27 - 31
-5, // Whitespace: Space
-9, -9, -9, -9, -9, -9, -9, -9, -9,
-9, // Decimal 33 - 42
62, // Plus sign at decimal 43
-9, -9, -9, // Decimal 44 - 46
63, // Slash at decimal 47
52, 53, 54, 55, 56, 57, 58, 59, 60,
61, // Numbers zero through nine
-9, -9, -9, // Decimal 58 - 60
-1, // Equals sign at decimal 61
-9, -9, -9, // Decimal 62 - 64
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, // Letters 'A' through 'N'
14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, // Letters 'O' through 'Z'
-9, -9, -9, -9, -9, -9, // Decimal 91 - 96
26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, // Letters 'a' through 'm'
39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, // Letters 'n' through 'z'
-9, -9, -9, -9 // Decimal 123 - 126
private static final byte[] DECODABET = {
-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8
-5, -5, // Whitespace: Tab and Linefeed
-9, -9, // Decimal 11 - 12
-5, // Whitespace: Carriage Return
-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
-9, -9, -9, -9, -9, // Decimal 27 - 31
-5, // Whitespace: Space
-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
62, // Plus sign at decimal 43
-9, -9, -9, // Decimal 44 - 46
63, // Slash at decimal 47
52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
-9, -9, -9, // Decimal 58 - 60
-1, // Equals sign at decimal 61
-9, -9, -9, // Decimal 62 - 64
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
-9, -9, -9, -9, -9, -9, // Decimal 91 - 96
26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
-9, -9, -9, -9 // Decimal 123 - 126
};
// Constructor(s)
// -------------------------------------------------------------------------
/** Trivial private ctor to enfore Singleton pattern. */
private Base64()
{
super();
}
// Class methods
// -------------------------------------------------------------------------
/**
* Encodes a byte array into Base64 notation. Equivalent to calling
* <code>encode(source, 0, source.length)</code>.
*
*
* @param src the data to convert.
*/
public static final String encode(final byte[] src)
@@ -163,7 +126,7 @@ public class Base64
/**
* Encodes a byte array into Base64 notation.
*
*
* @param src the data to convert.
* @param off offset in array where conversion should begin.
* @param len length of data to convert.
@@ -176,7 +139,7 @@ public class Base64
final byte[] outBuff = new byte[len43 // Main 4:3
+ ((len % 3) > 0 ? 4 : 0) // Account for padding
+ (breakLines ? (len43 / MAX_LINE_LENGTH)
: 0)]; // New lines
: 0)]; // New lines
int d = 0;
int e = 0;
final int len2 = len - 2;
@@ -192,13 +155,11 @@ public class Base64
lineLength = 0;
}
}
if (d < len)
{ // padding needed
if (d < len) // padding needed
{
encode3to4(src, d + off, len - d, outBuff, e);
e += 4;
}
return new String(outBuff, 0, e);
}
@@ -255,31 +216,26 @@ public class Base64
} // end if: quartet built
} // end if: equals sign or better
}
else
{
throw new IllegalArgumentException("Illegal BASE-64 character at #"
+ i + ": " + src[i]
+ "(decimal)");
}
throw new IllegalArgumentException("Illegal BASE-64 character at #"
+ i + ": " + src[i] + "(decimal)");
}
final byte[] result = new byte[outBuffPosn];
System.arraycopy(outBuff, 0, result, 0, outBuffPosn);
return result;
}
/**
* <p>Encodes up to three bytes of the array <code>src</code> and writes
* the resulting four Base64 bytes to <code>dest</code>. The source and
* Encodes up to three bytes of the array <code>src</code> and writes the
* resulting four Base64 bytes to <code>dest</code>. The source and
* destination arrays can be manipulated anywhere along their length by
* specifying <code>sOffset</code> and <code>dOffset</code>.</p>
*
* <p>This method does not check to make sure the arrays are large enough to
* specifying <code>sOffset</code> and <code>dOffset</code>.
* <p>
* This method does not check to make sure the arrays are large enough to
* accomodate <code>sOffset + 3</code> for the <code>src</code> array or
* <code>dOffset + 4</code> for the <code>dest</code> array. The actual
* number of significant bytes in the input array is given by
* <code>numBytes</code>.</p>
*
* <code>numBytes</code>.
*
* @param src the array to convert.
* @param sOffset the index where conversion begins.
* @param numBytes the number of significant bytes in your array.
@@ -302,25 +258,25 @@ public class Base64
// significant bytes passed in the array.
// We have to shift left 24 in order to flush out the 1's that appear
// when Java treats a value as negative that is cast from a byte to an int.
final int inBuff = (numBytes > 0 ? ((src[sOffset] << 24) >>> 8) : 0)
final int inBuff = (numBytes > 0 ? ((src[sOffset] << 24) >>> 8) : 0)
| (numBytes > 1 ? ((src[sOffset + 1] << 24) >>> 16) : 0)
| (numBytes > 2 ? ((src[sOffset + 2] << 24) >>> 24) : 0);
switch (numBytes)
{
case 3:
dest[dOffset] = ALPHABET[(inBuff >>> 18)];
dest[dOffset ] = ALPHABET[(inBuff >>> 18)];
dest[dOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3F];
dest[dOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3F];
dest[dOffset + 3] = ALPHABET[(inBuff) & 0x3F];
dest[dOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3F];
dest[dOffset + 3] = ALPHABET[(inBuff) & 0x3F];
break;
case 2:
dest[dOffset] = ALPHABET[(inBuff >>> 18)];
dest[dOffset ] = ALPHABET[(inBuff >>> 18)];
dest[dOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3F];
dest[dOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3F];
dest[dOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3F];
dest[dOffset + 3] = EQUALS_SIGN;
break;
case 1:
dest[dOffset] = ALPHABET[(inBuff >>> 18)];
dest[dOffset ] = ALPHABET[(inBuff >>> 18)];
dest[dOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3F];
dest[dOffset + 2] = EQUALS_SIGN;
dest[dOffset + 3] = EQUALS_SIGN;
@@ -330,19 +286,18 @@ public class Base64
}
/**
* <p>Decodes four bytes from array <code>src</code> and writes the
* resulting bytes (up to three of them) to <code>dest</code>.</p>
*
* <p>The source and destination arrays can be manipulated anywhere along
* their length by specifying <code>sOffset</code> and <code>dOffset</code>.
* </p>
*
* <p>This method does not check to make sure your arrays are large enough
* to accomodate <code>sOffset + 4</code> for the <code>src</code> array or
* Decodes four bytes from array <code>src</code> and writes the resulting
* bytes (up to three of them) to <code>dest</code>.
* <p>
* The source and destination arrays can be manipulated anywhere along their
* length by specifying <code>sOffset</code> and <code>dOffset</code>.
* <p>
* This method does not check to make sure your arrays are large enough to
* accomodate <code>sOffset + 4</code> for the <code>src</code> array or
* <code>dOffset + 3</code> for the <code>dest</code> array. This method
* returns the actual number of bytes that were converted from the Base64
* encoding.</p>
*
* encoding.
*
* @param src the array to convert.
* @param sOffset the index where conversion begins.
* @param dest the array to hold the conversion.
@@ -352,43 +307,41 @@ public class Base64
private static final int decode4to3(final byte[] src, final int sOffset,
final byte[] dest, final int dOffset)
{
if (src[sOffset + 2] == EQUALS_SIGN)
{ // Example: Dk==
final int outBuff = ((DECODABET[src[sOffset]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12);
dest[dOffset] = (byte) (outBuff >>> 16);
if (src[sOffset + 2] == EQUALS_SIGN) // Example: Dk==
{
final int outBuff = ((DECODABET[src[sOffset ]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12);
dest[dOffset] = (byte)(outBuff >>> 16);
return 1;
}
if (src[sOffset + 3] == EQUALS_SIGN)
{ // Example: DkL=
final int outBuff = ((DECODABET[src[sOffset]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12)
| ((DECODABET[src[sOffset + 2]] & 0xFF) << 6);
dest[dOffset] = (byte) (outBuff >>> 16);
dest[dOffset + 1] = (byte) (outBuff >>> 8);
if (src[sOffset + 3] == EQUALS_SIGN) // Example: DkL=
{
final int outBuff = ((DECODABET[src[sOffset ]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12)
| ((DECODABET[src[sOffset + 2]] & 0xFF) << 6);
dest[dOffset ] = (byte)(outBuff >>> 16);
dest[dOffset + 1] = (byte)(outBuff >>> 8);
return 2;
}
try
{ // Example: DkLE
final int outBuff = ((DECODABET[src[sOffset]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12)
| ((DECODABET[src[sOffset + 2]] & 0xFF) << 6)
| ((DECODABET[src[sOffset + 3]] & 0xFF));
dest[dOffset] = (byte) (outBuff >> 16);
dest[dOffset + 1] = (byte) (outBuff >> 8);
try // Example: DkLE
{
final int outBuff = ((DECODABET[src[sOffset ]] & 0xFF) << 18)
| ((DECODABET[src[sOffset + 1]] & 0xFF) << 12)
| ((DECODABET[src[sOffset + 2]] & 0xFF) << 6)
| ((DECODABET[src[sOffset + 3]] & 0xFF));
dest[dOffset ] = (byte)(outBuff >> 16);
dest[dOffset + 1] = (byte)(outBuff >> 8);
dest[dOffset + 2] = (byte) outBuff;
return 3;
}
catch (Exception x)
{
if (DEBUG && debuglevel > 8)
if (Configuration.DEBUG)
{
debug("" + src[sOffset] + ": " + (DECODABET[src[sOffset]]));
debug("" + src[sOffset + 1] + ": " + (DECODABET[src[sOffset + 1]]));
debug("" + src[sOffset + 2] + ": " + (DECODABET[src[sOffset + 2]]));
debug("" + src[sOffset + 3] + ": " + (DECODABET[src[sOffset + 3]]));
log.fine("" + src[sOffset ] + ": " + (DECODABET[src[sOffset ]]));
log.fine("" + src[sOffset + 1] + ": " + (DECODABET[src[sOffset + 1]]));
log.fine("" + src[sOffset + 2] + ": " + (DECODABET[src[sOffset + 2]]));
log.fine("" + src[sOffset + 3] + ": " + (DECODABET[src[sOffset + 3]]));
}
return -1;
}