/hg/icedtea-web: sun.misc.BASE64Encoder replaced by internal imp...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Oct 17 09:47:15 PDT 2011
changeset f1468696eda3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f1468696eda3
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 17 18:41:42 2011 +0200
sun.misc.BASE64Encoder replaced by internal implementation
diffstat:
ChangeLog | 14 +
configure.ac | 2 -
netx/net/sourceforge/jnlp/security/CertificateUtils.java | 2 +-
netx/net/sourceforge/jnlp/util/replacements/BASE64Encoder.java | 110 +++
netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java | 354 ++++++++++
tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java | 128 +++
6 files changed, 607 insertions(+), 3 deletions(-)
diffs (truncated from 656 to 500 lines):
diff -r 2a7aa789f554 -r f1468696eda3 ChangeLog
--- a/ChangeLog Mon Oct 03 15:28:10 2011 +0200
+++ b/ChangeLog Mon Oct 17 18:41:42 2011 +0200
@@ -1,3 +1,17 @@
+2011-10-17 Jiri Vanek <jvanek at redhat.com>
+
+ PR564: NetX depends on sun.misc.BASE64Encoder
+ * configure.ac: removed IT564 comment, removed check for sun.misc.BASE64Encoder
+ * netx/net/sourceforge/jnlp/security/CertificateUtils.java : sun.misc.BASE64Encoder;
+ replaced (just changed import) by internal implementation from
+ net.sourceforge.jnlp.util.replacements.BASE64Encoder;
+ * netx/net/sourceforge/jnlp/util/replacements/BASE64Encoder.java:
+ * netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java:
+ New files, internal implementation of BASE64Encoder, copied from OpenJDK
+ * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java
+ New file, to test internal base64encoder implementation
+
+
2011-10-03 Jiri Vanek <jvanek at redhat.com>
* tests/jnlp_tests/signed/ReadPropertiesBySignedHack/resources/ReadPropertiesBySignedHack.jnlp
diff -r 2a7aa789f554 -r f1468696eda3 configure.ac
--- a/configure.ac Mon Oct 03 15:28:10 2011 +0200
+++ b/configure.ac Mon Oct 17 18:41:42 2011 +0200
@@ -53,7 +53,6 @@
dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
dnl IT563 - NetX uses sun.security code
-dnl IT564 - NetX depends on sun.misc.BASE64Encoder
dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
dnl IT570 - NetX depends on sun.applet.AppletViewPanel
dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
@@ -70,7 +69,6 @@
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants])
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker])
IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name])
-IT_CHECK_FOR_CLASS(SUN_MISC_BASE64ENCODER, [sun.misc.BASE64Encoder])
IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException])
IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER,
diff -r 2a7aa789f554 -r f1468696eda3 netx/net/sourceforge/jnlp/security/CertificateUtils.java
--- a/netx/net/sourceforge/jnlp/security/CertificateUtils.java Mon Oct 03 15:28:10 2011 +0200
+++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.java Mon Oct 17 18:41:42 2011 +0200
@@ -60,7 +60,7 @@
import java.util.Random;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
-import sun.misc.BASE64Encoder;
+import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
import sun.security.provider.X509Factory;
/**
diff -r 2a7aa789f554 -r f1468696eda3 netx/net/sourceforge/jnlp/util/replacements/BASE64Encoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/replacements/BASE64Encoder.java Mon Oct 17 18:41:42 2011 +0200
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * This class implements a BASE64 Character encoder as specified in RFC1521.
+ * This RFC is part of the MIME specification as published by the Internet
+ * Engineering Task Force (IETF). Unlike some other encoding schemes there
+ * is nothing in this encoding that indicates
+ * where a buffer starts or ends.
+ *
+ * This means that the encoded text will simply start with the first line
+ * of encoded text and end with the last line of encoded text.
+ *
+ * @author Chuck McManis
+ * @see CharacterEncoder
+ * @see BASE64Decoder
+ */
+
+public class BASE64Encoder extends CharacterEncoder {
+
+ /** this class encodes three bytes per atom. */
+ protected int bytesPerAtom() {
+ return (3);
+ }
+
+ /**
+ * this class encodes 57 bytes per line. This results in a maximum
+ * of 57/3 * 4 or 76 characters per output line. Not counting the
+ * line termination.
+ */
+ protected int bytesPerLine() {
+ return (57);
+ }
+
+ /** This array maps the characters to their 6 bit values */
+ private final static char pem_array[] = {
+ // 0 1 2 3 4 5 6 7
+ 'A','B','C','D','E','F','G','H', // 0
+ 'I','J','K','L','M','N','O','P', // 1
+ 'Q','R','S','T','U','V','W','X', // 2
+ 'Y','Z','a','b','c','d','e','f', // 3
+ 'g','h','i','j','k','l','m','n', // 4
+ 'o','p','q','r','s','t','u','v', // 5
+ 'w','x','y','z','0','1','2','3', // 6
+ '4','5','6','7','8','9','+','/' // 7
+ };
+
+ /**
+ * encodeAtom - Take three bytes of input and encode it as 4
+ * printable characters. Note that if the length in len is less
+ * than three is encodes either one or two '=' signs to indicate
+ * padding characters.
+ */
+ protected void encodeAtom(OutputStream outStream, byte data[], int offset, int len)
+ throws IOException {
+ byte a, b, c;
+
+ if (len == 1) {
+ a = data[offset];
+ b = 0;
+ c = 0;
+ outStream.write(pem_array[(a >>> 2) & 0x3F]);
+ outStream.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+ outStream.write('=');
+ outStream.write('=');
+ } else if (len == 2) {
+ a = data[offset];
+ b = data[offset+1];
+ c = 0;
+ outStream.write(pem_array[(a >>> 2) & 0x3F]);
+ outStream.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+ outStream.write(pem_array[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
+ outStream.write('=');
+ } else {
+ a = data[offset];
+ b = data[offset+1];
+ c = data[offset+2];
+ outStream.write(pem_array[(a >>> 2) & 0x3F]);
+ outStream.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+ outStream.write(pem_array[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
+ outStream.write(pem_array[c & 0x3F]);
+ }
+ }
+}
diff -r 2a7aa789f554 -r f1468696eda3 netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java Mon Oct 17 18:41:42 2011 +0200
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+
+/**
+ * This class defines the encoding half of character encoders.
+ * A character encoder is an algorithim for transforming 8 bit binary
+ * data into text (generally 7 bit ASCII or 8 bit ISO-Latin-1 text)
+ * for transmition over text channels such as e-mail and network news.
+ *
+ * The character encoders have been structured around a central theme
+ * that, in general, the encoded text has the form:
+ *
+ * <pre>
+ * [Buffer Prefix]
+ * [Line Prefix][encoded data atoms][Line Suffix]
+ * [Buffer Suffix]
+ * </pre>
+ *
+ * In the CharacterEncoder and CharacterDecoder classes, one complete
+ * chunk of data is referred to as a <i>buffer</i>. Encoded buffers
+ * are all text, and decoded buffers (sometimes just referred to as
+ * buffers) are binary octets.
+ *
+ * To create a custom encoder, you must, at a minimum, overide three
+ * abstract methods in this class.
+ * <DL>
+ * <DD>bytesPerAtom which tells the encoder how many bytes to
+ * send to encodeAtom
+ * <DD>encodeAtom which encodes the bytes sent to it as text.
+ * <DD>bytesPerLine which tells the encoder the maximum number of
+ * bytes per line.
+ * </DL>
+ *
+ * Several useful encoders have already been written and are
+ * referenced in the See Also list below.
+ *
+ * @author Chuck McManis
+ * @see CharacterDecoder;
+ * @see UCEncoder
+ * @see UUEncoder
+ * @see BASE64Encoder
+ */
+public abstract class CharacterEncoder {
+
+ /** Stream that understands "printing" */
+ protected PrintStream pStream;
+
+ /** Return the number of bytes per atom of encoding */
+ abstract protected int bytesPerAtom();
+
+ /** Return the number of bytes that can be encoded per line */
+ abstract protected int bytesPerLine();
+
+ /**
+ * Encode the prefix for the entire buffer. By default is simply
+ * opens the PrintStream for use by the other functions.
+ */
+ protected void encodeBufferPrefix(OutputStream aStream) throws IOException {
+ pStream = new PrintStream(aStream);
+ }
+
+ /**
+ * Encode the suffix for the entire buffer.
+ */
+ protected void encodeBufferSuffix(OutputStream aStream) throws IOException {
+ }
+
+ /**
+ * Encode the prefix that starts every output line.
+ */
+ protected void encodeLinePrefix(OutputStream aStream, int aLength)
+ throws IOException {
+ }
+
+ /**
+ * Encode the suffix that ends every output line. By default
+ * this method just prints a <newline> into the output stream.
+ */
+ protected void encodeLineSuffix(OutputStream aStream) throws IOException {
+ pStream.println();
+ }
+
+ /** Encode one "atom" of information into characters. */
+ abstract protected void encodeAtom(OutputStream aStream, byte someBytes[],
+ int anOffset, int aLength) throws IOException;
+
+ /**
+ * This method works around the bizarre semantics of BufferedInputStream's
+ * read method.
+ */
+ protected int readFully(InputStream in, byte buffer[])
+ throws java.io.IOException {
+ for (int i = 0; i < buffer.length; i++) {
+ int q = in.read();
+ if (q == -1)
+ return i;
+ buffer[i] = (byte)q;
+ }
+ return buffer.length;
+ }
+
+ /**
+ * Encode bytes from the input stream, and write them as text characters
+ * to the output stream. This method will run until it exhausts the
+ * input stream, but does not print the line suffix for a final
+ * line that is shorter than bytesPerLine().
+ */
+ public void encode(InputStream inStream, OutputStream outStream)
+ throws IOException {
+ int j;
+ int numBytes;
+ byte tmpbuffer[] = new byte[bytesPerLine()];
+
+ encodeBufferPrefix(outStream);
+
+ while (true) {
+ numBytes = readFully(inStream, tmpbuffer);
+ if (numBytes == 0) {
+ break;
+ }
+ encodeLinePrefix(outStream, numBytes);
+ for (j = 0; j < numBytes; j += bytesPerAtom()) {
+
+ if ((j + bytesPerAtom()) <= numBytes) {
+ encodeAtom(outStream, tmpbuffer, j, bytesPerAtom());
+ } else {
+ encodeAtom(outStream, tmpbuffer, j, (numBytes)- j);
+ }
+ }
+ if (numBytes < bytesPerLine()) {
+ break;
+ } else {
+ encodeLineSuffix(outStream);
+ }
+ }
+ encodeBufferSuffix(outStream);
+ }
+
+ /**
+ * Encode the buffer in <i>aBuffer</i> and write the encoded
+ * result to the OutputStream <i>aStream</i>.
+ */
+ public void encode(byte aBuffer[], OutputStream aStream)
+ throws IOException {
+ ByteArrayInputStream inStream = new ByteArrayInputStream(aBuffer);
+ encode(inStream, aStream);
+ }
+
+ /**
+ * A 'streamless' version of encode that simply takes a buffer of
+ * bytes and returns a string containing the encoded buffer.
+ */
+ public String encode(byte aBuffer[]) {
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ ByteArrayInputStream inStream = new ByteArrayInputStream(aBuffer);
+ String retVal = null;
+ try {
+ encode(inStream, outStream);
+ // explicit ascii->unicode conversion
+ retVal = outStream.toString("8859_1");
+ } catch (Exception IOException) {
+ // This should never happen.
+ throw new Error("CharacterEncoder.encode internal error");
+ }
+ return (retVal);
+ }
+
+ /**
+ * Return a byte array from the remaining bytes in this ByteBuffer.
+ * <P>
+ * The ByteBuffer's position will be advanced to ByteBuffer's limit.
+ * <P>
+ * To avoid an extra copy, the implementation will attempt to return the
+ * byte array backing the ByteBuffer. If this is not possible, a
+ * new byte array will be created.
+ */
+ private byte [] getBytes(ByteBuffer bb) {
+ /*
+ * This should never return a BufferOverflowException, as we're
+ * careful to allocate just the right amount.
+ */
+ byte [] buf = null;
+
+ /*
+ * If it has a usable backing byte buffer, use it. Use only
+ * if the array exactly represents the current ByteBuffer.
+ */
+ if (bb.hasArray()) {
+ byte [] tmp = bb.array();
+ if ((tmp.length == bb.capacity()) &&
+ (tmp.length == bb.remaining())) {
+ buf = tmp;
+ bb.position(bb.limit());
+ }
+ }
+
+ if (buf == null) {
+ /*
+ * This class doesn't have a concept of encode(buf, len, off),
+ * so if we have a partial buffer, we must reallocate
+ * space.
+ */
+ buf = new byte[bb.remaining()];
+
+ /*
+ * position() automatically updated
+ */
+ bb.get(buf);
+ }
+
+ return buf;
+ }
+
+ /**
+ * Encode the <i>aBuffer</i> ByteBuffer and write the encoded
+ * result to the OutputStream <i>aStream</i>.
+ * <P>
+ * The ByteBuffer's position will be advanced to ByteBuffer's limit.
+ */
+ public void encode(ByteBuffer aBuffer, OutputStream aStream)
+ throws IOException {
+ byte [] buf = getBytes(aBuffer);
+ encode(buf, aStream);
+ }
+
+ /**
+ * A 'streamless' version of encode that simply takes a ByteBuffer
+ * and returns a string containing the encoded buffer.
+ * <P>
+ * The ByteBuffer's position will be advanced to ByteBuffer's limit.
+ */
+ public String encode(ByteBuffer aBuffer) {
+ byte [] buf = getBytes(aBuffer);
+ return encode(buf);
+ }
+
+ /**
+ * Encode bytes from the input stream, and write them as text characters
+ * to the output stream. This method will run until it exhausts the
+ * input stream. It differs from encode in that it will add the
+ * line at the end of a final line that is shorter than bytesPerLine().
+ */
+ public void encodeBuffer(InputStream inStream, OutputStream outStream)
+ throws IOException {
+ int j;
+ int numBytes;
+ byte tmpbuffer[] = new byte[bytesPerLine()];
+
+ encodeBufferPrefix(outStream);
+
+ while (true) {
+ numBytes = readFully(inStream, tmpbuffer);
+ if (numBytes == 0) {
+ break;
+ }
+ encodeLinePrefix(outStream, numBytes);
+ for (j = 0; j < numBytes; j += bytesPerAtom()) {
+ if ((j + bytesPerAtom()) <= numBytes) {
+ encodeAtom(outStream, tmpbuffer, j, bytesPerAtom());
+ } else {
+ encodeAtom(outStream, tmpbuffer, j, (numBytes)- j);
+ }
+ }
+ encodeLineSuffix(outStream);
+ if (numBytes < bytesPerLine()) {
+ break;
+ }
+ }
+ encodeBufferSuffix(outStream);
+ }
+
+ /**
+ * Encode the buffer in <i>aBuffer</i> and write the encoded
+ * result to the OutputStream <i>aStream</i>.
+ */
+ public void encodeBuffer(byte aBuffer[], OutputStream aStream)
+ throws IOException {
+ ByteArrayInputStream inStream = new ByteArrayInputStream(aBuffer);
+ encodeBuffer(inStream, aStream);
+ }
+
+ /**
+ * A 'streamless' version of encode that simply takes a buffer of
+ * bytes and returns a string containing the encoded buffer.
+ */
+ public String encodeBuffer(byte aBuffer[]) {
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ ByteArrayInputStream inStream = new ByteArrayInputStream(aBuffer);
+ try {
+ encodeBuffer(inStream, outStream);
+ } catch (Exception IOException) {
+ // This should never happen.
+ throw new Error("CharacterEncoder.encodeBuffer internal error");
+ }
+ return (outStream.toString());
+ }
+
More information about the distro-pkg-dev
mailing list