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

Sync libgcj with GNU Classpath 0.98.

Browse Source 
2009-02-13  Andrew John Hughes  <ahughes@redhat.com>

	Import GNU Classpath (classpath-0_98-release).

	* Makefile.am: Add natVMSecureRandom.cc.
	* Makefile.in: Regenerated.
	* classpath/ChangeLog,
	* classpath/Makefile.am: Merged.
	* classpath/Makefile.in: Regenerated.
	* classpath/NEWS: Merged.
	* classpath/config.guess,
	* classpath/config.sub,
	* classpath/configure: Regenerated.
	* classpath/configure.ac: Merged.
	* classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,
	* classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java,
	* classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java,
	* classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java,
	* classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java,
	* classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,
	* classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,
	* classpath/gnu/javax/crypto/prng/ICMGenerator.java,
	* classpath/gnu/xml/stream/XMLParser.java,
	* classpath/java/security/SecureRandom.java,
	* classpath/native/jni/native-lib/cpproc.c,
	* classpath/native/plugin/gcjwebplugin.cc,
	* classpath/tools/gnu/classpath/tools/gjdoc/Main.java: Merged.
	* configure: Regenerated.
	* configure.ac: Add symlink for natVMSecureRandomPosix.cc to natVMSecureRandom.cc
	* gnu/classpath/Configuration.java: Change version to 0.98.
	* gnu/java/security/jce/prng/SecureRandomAdapter.h: Regenerated.
	* gnu/java/security/jce/prng/VMSecureRandom.h: Generated.
	* gnu/java/security/jce/prng/VMSecureRandom.java: Added native implementation.
	* gnu/java/security/jce/prng/natVMSecureRandomPosix.cc: Wrapper around /dev/random.
	* gnu/javax/crypto/jce/prng/CSPRNGSpi.h,
	* gnu/javax/crypto/jce/prng/FortunaImpl.h,
	* java/security/SecureRandom.h: Regenerated.
	* java/security/VMSecureRandom$Spinner.h,
	* java/security/VMSecureRandom.h,
	* java/security/VMSecureRandom.java: Removed.
	* sources.am: Move VMSecureRandom to gnu.java.security.jce.prng.

From-SVN: r144434
This commit is contained in:
Andrew John Hughes
2009-02-25 21:40:28 +00:00
parent a16b68bb66
commit dc6a0b2d94
66 changed files with 612 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
+3 -1
View File
@@ -1246,7 +1246,9 @@ public abstract class CairoGraphics2D extends Graphics2D
public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
{
draw(new Polygon(xPoints, yPoints, nPoints));
for (int i = 1; i < nPoints; i++)
draw(new Line2D.Double(xPoints[i - 1], yPoints[i - 1],
xPoints[i], yPoints[i]));
}
public void drawOval(int x, int y, int width, int height)
libjava/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java
+99 -22
View File
@@ -38,35 +38,57 @@ exception statement from your version. */
package gnu.java.security.jce.prng;
import gnu.java.security.action.GetSecurityPropertyAction;
import gnu.classpath.SystemProperties;
import gnu.java.security.prng.LimitReachedException;
import gnu.java.security.prng.MDGenerator;
import java.security.AccessController;
import java.security.SecureRandom;
import java.security.SecureRandomSpi;
import java.util.Collections;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.InputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
/**
* The implementation of a generic {@link java.security.SecureRandom} adapter
* class to wrap GNU PRNG instances based on Message Digest algorithms.
* <p>
* This class defines the <i>Service Provider Interface</i> (<b>SPI</b>) for
* <p>The implementation of a generic {@link java.security.SecureRandom} adapter
* class to wrap gnu.crypto prng instances based on Message Digest algorithms.</p>
*
* <p>This class defines the <i>Service Provider Interface</i> (<b>SPI</b>) for
* the {@link java.security.SecureRandom} class, which provides the
* functionality of a cryptographically strong pseudo-random number generator.
* <p>
* All the abstract methods in the {@link SecureRandomSpi} class are implemented
* by this class and all its sub-classes.
* functionality of a cryptographically strong pseudo-random number generator.</p>
*
* <p>All the abstract methods in the {@link SecureRandomSpi} class are
* implemented by this class and all its sub-classes.</p>
*/
abstract class SecureRandomAdapter
extends SecureRandomSpi
public abstract class SecureRandomAdapter
extends SecureRandomSpi
{
private boolean isSeeded = false;
/** Our underlying prng instance. */
private MDGenerator adaptee = new MDGenerator();
/** The name of the message digest algorithm used by the adaptee. */
private String mdName;
private static final Logger logger =
Logger.getLogger(SecureRandom.class.getName());
private static final String SECURERANDOM_SOURCE = "securerandom.source";
private static final String JAVA_SECURITY_EGD = "java.security.egd";
/**
* Trivial protected constructor.
*
* <p>Trivial protected constructor.</p>
*
* @param mdName the canonical name of the underlying hash algorithm.
*/
protected SecureRandomAdapter(String mdName)
@@ -74,23 +96,77 @@ abstract class SecureRandomAdapter
super();
this.mdName = mdName;
adaptee.init(Collections.singletonMap(MDGenerator.MD_NAME, mdName));
adaptee.init (Collections.singletonMap (MDGenerator.MD_NAME, mdName));
}
public static final byte[] getSeed(int numBytes)
{
URL sourceUrl = null;
String urlStr = null;
byte[] buffer = new byte[numBytes];
GetSecurityPropertyAction action =
new GetSecurityPropertyAction(SECURERANDOM_SOURCE);
try
{
urlStr = (String) AccessController.doPrivileged(action);
if (urlStr != null)
sourceUrl = new URL(urlStr);
}
catch (MalformedURLException ignored)
{
logger.log(Level.WARNING,
SECURERANDOM_SOURCE + " property is malformed: {0}",
urlStr);
}
if (sourceUrl == null)
{
try
{
urlStr = SystemProperties.getProperty(JAVA_SECURITY_EGD);
if (urlStr != null)
sourceUrl = new URL(urlStr);
}
catch (MalformedURLException mue)
{
logger.log(Level.WARNING,
JAVA_SECURITY_EGD + " property is malformed: {0}",
urlStr);
}
}
if (sourceUrl != null)
{
try
{
InputStream in = sourceUrl.openStream();
in.read(buffer);
return buffer;
}
catch (IOException ioe)
{
logger.log(Level.FINE, "error reading random bytes", ioe);
}
}
// If we get here, we did not get any seed from a property URL.
VMSecureRandom.generateSeed(buffer, 0, buffer.length);
return buffer;
}
public byte[] engineGenerateSeed(int numBytes)
{
if (numBytes < 1)
return new byte[0];
byte[] result = new byte[numBytes];
this.engineNextBytes(result);
return result;
return getSeed(numBytes);
}
public void engineNextBytes(byte[] bytes)
{
if (! adaptee.isInitialised())
this.engineSetSeed(new byte[0]);
if (!isSeeded)
{
engineSetSeed(engineGenerateSeed(32));
}
try
{
adaptee.nextBytes(bytes, 0, bytes.length);
@@ -102,6 +178,7 @@ abstract class SecureRandomAdapter
public void engineSetSeed(byte[] seed)
{
adaptee.addRandomBytes(seed);
adaptee.addRandomBytes (seed);
isSeeded = true;
}
}
libjava/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java
+8 -7
View File
@@ -39,12 +39,17 @@ exception statement from your version. */
package gnu.javax.crypto.jce.prng;
import gnu.java.security.Registry;
import gnu.javax.crypto.prng.ARCFour;
import gnu.java.security.jce.prng.SecureRandomAdapter;
import gnu.java.security.prng.IRandom;
import gnu.java.security.prng.LimitReachedException;
import gnu.javax.crypto.prng.ARCFour;
import gnu.javax.crypto.prng.PRNGFactory;
import java.security.SecureRandomSpi;
import java.util.HashMap;
/**
@@ -71,17 +76,13 @@ public class ARCFourRandomSpi
public byte[] engineGenerateSeed(int numBytes)
{
if (numBytes < 1)
return new byte[0];
byte[] result = new byte[numBytes];
this.engineNextBytes(result);
return result;
return SecureRandomAdapter.getSeed(numBytes);
}
public void engineNextBytes(byte[] bytes)
{
if (virgin)
this.engineSetSeed(new byte[0]);
this.engineSetSeed(engineGenerateSeed(32));
try
{
adaptee.nextBytes(bytes, 0, bytes.length);
libjava/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
+9 -8
View File
@@ -40,6 +40,7 @@ package gnu.javax.crypto.jce.prng;
import gnu.java.security.prng.IRandom;
import gnu.java.security.prng.LimitReachedException;
import gnu.java.security.jce.prng.SecureRandomAdapter;
import gnu.javax.crypto.prng.CSPRNG;
import java.net.MalformedURLException;
@@ -53,6 +54,7 @@ public class CSPRNGSpi
extends SecureRandomSpi
{
private final IRandom adaptee;
private boolean virgin = true;
public CSPRNGSpi() throws ClassNotFoundException, MalformedURLException,
NumberFormatException
@@ -62,21 +64,19 @@ public class CSPRNGSpi
adaptee = CSPRNG.getSystemInstance();
}
protected byte[] engineGenerateSeed(final int count)
protected byte[] engineGenerateSeed(final int numBytes)
{
if (count < 0)
throw new IllegalArgumentException("count must be nonnegative");
byte[] buf = new byte[count];
if (count == 0)
return buf;
engineNextBytes(buf);
return buf;
return SecureRandomAdapter.getSeed(numBytes);
}
protected void engineNextBytes(final byte[] buffer)
{
if (buffer == null)
throw new NullPointerException();
if (virgin)
{
engineSetSeed(engineGenerateSeed(32));
}
try
{
adaptee.nextBytes(buffer, 0, buffer.length);
@@ -92,5 +92,6 @@ public class CSPRNGSpi
if (seed == null)
throw new NullPointerException();
adaptee.addRandomBytes(seed, 0, seed.length);
virgin = false;
}
}
libjava/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java
+19 -6
View File
@@ -39,6 +39,9 @@ exception statement from your version. */
package gnu.javax.crypto.jce.prng;
import gnu.java.security.prng.LimitReachedException;
import gnu.java.security.jce.prng.SecureRandomAdapter;
import gnu.javax.crypto.prng.Fortuna;
import java.security.SecureRandomSpi;
@@ -47,19 +50,27 @@ import java.util.Collections;
public final class FortunaImpl
extends SecureRandomSpi
{
private boolean virgin = true;
private final Fortuna adaptee;
public FortunaImpl()
{
adaptee = new Fortuna();
adaptee.init(Collections.singletonMap(Fortuna.SEED, new byte[0]));
}
protected void engineSetSeed(byte[] seed)
{
synchronized (adaptee)
{
adaptee.addRandomBytes(seed);
if (virgin)
{
adaptee.init (Collections.singletonMap (Fortuna.SEED, seed));
virgin = false;
}
else
{
adaptee.addRandomBytes (seed);
}
}
}
@@ -67,6 +78,10 @@ public final class FortunaImpl
{
synchronized (adaptee)
{
if (virgin)
{
this.engineSetSeed(engineGenerateSeed(32));
}
try
{
adaptee.nextBytes(buffer);
@@ -78,10 +93,8 @@ public final class FortunaImpl
}
}
protected byte[] engineGenerateSeed(int numbytes)
protected byte[] engineGenerateSeed(int numBytes)
{
byte[] seed = new byte[numbytes];
engineNextBytes(seed);
return seed;
return SecureRandomAdapter.getSeed(numBytes);
}
}
libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
+5 -16
View File
@@ -40,6 +40,7 @@ package gnu.javax.crypto.jce.prng;
import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.jce.prng.SecureRandomAdapter;
import gnu.java.security.prng.LimitReachedException;
import gnu.javax.crypto.cipher.IBlockCipher;
import gnu.javax.crypto.prng.ICMGenerator;
@@ -107,19 +108,7 @@ public class ICMRandomSpi
public byte[] engineGenerateSeed(int numBytes)
{
if (Configuration.DEBUG)
log.entering(this.getClass().getName(), "engineGenerateSeed");
if (numBytes < 1)
{
if (Configuration.DEBUG)
log.exiting(this.getClass().getName(), "engineGenerateSeed");
return new byte[0];
}
byte[] result = new byte[numBytes];
this.engineNextBytes(result);
if (Configuration.DEBUG)
log.exiting(this.getClass().getName(), "engineGenerateSeed");
return result;
return SecureRandomAdapter.getSeed(numBytes);
}
public void engineNextBytes(byte[] bytes)
@@ -127,7 +116,7 @@ public class ICMRandomSpi
if (Configuration.DEBUG)
log.entering(this.getClass().getName(), "engineNextBytes");
if (! adaptee.isInitialised())
this.engineSetSeed(new byte[0]);
this.engineSetSeed(engineGenerateSeed(32));
while (true)
{
try
@@ -207,8 +196,8 @@ public class ICMRandomSpi
System.arraycopy(material, 16, offset, 0, 16);
attributes.put(ICMGenerator.OFFSET, offset);
// specify the index
byte[] index = new byte[8];
System.arraycopy(material, 32, index, 0, 8);
byte[] index = new byte[4];
System.arraycopy(material, 32, index, 0, 4);
attributes.put(ICMGenerator.SEGMENT_INDEX, new BigInteger(1, index));
adaptee.init(attributes);
if (Configuration.DEBUG)
libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
+4 -6
View File
@@ -41,6 +41,7 @@ package gnu.javax.crypto.jce.prng;
import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.prng.LimitReachedException;
import gnu.java.security.jce.prng.SecureRandomAdapter;
import gnu.javax.crypto.cipher.IBlockCipher;
import gnu.javax.crypto.prng.UMacGenerator;
@@ -57,6 +58,7 @@ public class UMacRandomSpi
extends SecureRandomSpi
{
private static final Logger log = Logger.getLogger(UMacRandomSpi.class.getName());
/** Class-wide prng to generate random material for the underlying prng. */
private static final UMacGenerator prng; // blank final
static
@@ -88,17 +90,13 @@ public class UMacRandomSpi
public byte[] engineGenerateSeed(int numBytes)
{
if (numBytes < 1)
return new byte[0];
byte[] result = new byte[numBytes];
this.engineNextBytes(result);
return result;
return SecureRandomAdapter.getSeed(numBytes);
}
public void engineNextBytes(byte[] bytes)
{
if (! adaptee.isInitialised())
this.engineSetSeed(new byte[0]);
engineSetSeed(engineGenerateSeed(32));
while (true)
{
try
libjava/classpath/gnu/javax/crypto/prng/ICMGenerator.java
+9
View File
@@ -263,6 +263,15 @@ public class ICMGenerator
// C[0] = (s * (256^BLOCK_INDEX_LENGTH) + r) modulo (256^BLOCK_LENGTH)
C0 = segmentNdx.multiply(TWO_FIFTY_SIX.pow(blockNdxLength))
.add(r).modPow(BigInteger.ONE, counterRange);
try
{
fillBlock();
}
catch (LimitReachedException impossible)
{
throw (InternalError)
new InternalError().initCause(impossible);
}
}
public void fillBlock() throws LimitReachedException
libjava/classpath/gnu/xml/stream/XMLParser.java
+12 -2
View File
@@ -725,7 +725,10 @@ public class XMLParser
case XMLStreamConstants.END_ELEMENT:
String qName = buf.toString();
int ci = qName.indexOf(':');
return (ci == -1) ? qName : qName.substring(ci + 1);
String localName = (ci == -1) ? qName : qName.substring(ci + 1);
if (stringInterning)
localName = localName.intern();
return localName;
default:
return null;
}
@@ -745,9 +748,13 @@ public class XMLParser
String qName = buf.toString();
int ci = qName.indexOf(':');
String localName = (ci == -1) ? qName : qName.substring(ci + 1);
if (stringInterning)
localName = localName.intern();
String prefix = (ci == -1) ?
(namespaceAware ? XMLConstants.DEFAULT_NS_PREFIX : null) :
qName.substring(0, ci);
if (stringInterning && prefix != null)
prefix = prefix.intern();
String namespaceURI = getNamespaceURI(prefix);
return new QName(namespaceURI, localName, prefix);
default:
@@ -831,9 +838,12 @@ public class XMLParser
case XMLStreamConstants.END_ELEMENT:
String qName = buf.toString();
int ci = qName.indexOf(':');
return (ci == -1) ?
String prefix = (ci == -1) ?
(namespaceAware ? XMLConstants.DEFAULT_NS_PREFIX : null) :
qName.substring(0, ci);
if (stringInterning && prefix != null)
prefix = prefix.intern();
return prefix;
default:
return null;
}