From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 18 May 2006 17:29:21 +0000 Subject: Imported GNU Classpath 0.90 Imported GNU Classpath 0.90 * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. From-SVN: r113887 --- libjava/classpath/java/security/cert/CertPathValidatorSpi.java | 4 +++- libjava/classpath/java/security/cert/CertStoreSpi.java | 3 ++- libjava/classpath/java/security/cert/Certificate.java | 2 +- libjava/classpath/java/security/cert/PKIXCertPathChecker.java | 2 +- libjava/classpath/java/security/cert/PKIXParameters.java | 2 +- libjava/classpath/java/security/cert/X509CertSelector.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) (limited to 'libjava/classpath/java/security/cert') diff --git a/libjava/classpath/java/security/cert/CertPathValidatorSpi.java b/libjava/classpath/java/security/cert/CertPathValidatorSpi.java index 8d18b49..282b7a6 100644 --- a/libjava/classpath/java/security/cert/CertPathValidatorSpi.java +++ b/libjava/classpath/java/security/cert/CertPathValidatorSpi.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security.cert; +import java.security.InvalidAlgorithmParameterException; + /** * The service provider interface (SPI) for the {@link * CertPathValidator} class. Providers implementing certificate path @@ -75,5 +77,5 @@ public abstract class CertPathValidatorSpi public abstract CertPathValidatorResult engineValidate(CertPath certPath, CertPathParameters params) throws CertPathValidatorException, - java.security.InvalidAlgorithmParameterException; + InvalidAlgorithmParameterException; } diff --git a/libjava/classpath/java/security/cert/CertStoreSpi.java b/libjava/classpath/java/security/cert/CertStoreSpi.java index eca0e86..a69545f 100644 --- a/libjava/classpath/java/security/cert/CertStoreSpi.java +++ b/libjava/classpath/java/security/cert/CertStoreSpi.java @@ -38,6 +38,7 @@ exception statement from your version. */ package java.security.cert; +import java.security.InvalidAlgorithmParameterException; import java.util.Collection; /** @@ -69,7 +70,7 @@ public abstract class CertStoreSpi * parameters are inappropriate for this class. */ public CertStoreSpi(CertStoreParameters params) - throws java.security.InvalidAlgorithmParameterException + throws InvalidAlgorithmParameterException { super(); } diff --git a/libjava/classpath/java/security/cert/Certificate.java b/libjava/classpath/java/security/cert/Certificate.java index f8456f9..33a14a4 100644 --- a/libjava/classpath/java/security/cert/Certificate.java +++ b/libjava/classpath/java/security/cert/Certificate.java @@ -73,7 +73,7 @@ import java.security.SignatureException; */ public abstract class Certificate implements Serializable { - private static final long serialVersionUID = -6751606818319535583L; + private static final long serialVersionUID = -3585440601605666277L; private String type; diff --git a/libjava/classpath/java/security/cert/PKIXCertPathChecker.java b/libjava/classpath/java/security/cert/PKIXCertPathChecker.java index 7a33576..a6eef41 100644 --- a/libjava/classpath/java/security/cert/PKIXCertPathChecker.java +++ b/libjava/classpath/java/security/cert/PKIXCertPathChecker.java @@ -46,7 +46,7 @@ import java.util.Set; * *

Concrete subclasses can be passed to the {@link * PKIXParameters#setCertPathCheckers(java.util.List)} and {@link - * PKIXParameters#addCertPathChecker(java.security.cert.PKIXCertPathChecker} + * PKIXParameters#addCertPathChecker(java.security.cert.PKIXCertPathChecker)} * methods, which are then used to set up PKIX certificate chain * builders or validators. These classes then call the {@link * #check(java.security.cert.Certificate,java.util.Collection)} method diff --git a/libjava/classpath/java/security/cert/PKIXParameters.java b/libjava/classpath/java/security/cert/PKIXParameters.java index 4a98711..16ef07f 100644 --- a/libjava/classpath/java/security/cert/PKIXParameters.java +++ b/libjava/classpath/java/security/cert/PKIXParameters.java @@ -55,7 +55,7 @@ import java.util.Set; * Parameters for verifying certificate paths using the PKIX * (Public-Key Infrastructure (X.509)) algorithm. * - * @see CertPathBulider + * @see CertPathBuilder */ public class PKIXParameters implements CertPathParameters { diff --git a/libjava/classpath/java/security/cert/X509CertSelector.java b/libjava/classpath/java/security/cert/X509CertSelector.java index e3b8c0e..a46d228 100644 --- a/libjava/classpath/java/security/cert/X509CertSelector.java +++ b/libjava/classpath/java/security/cert/X509CertSelector.java @@ -367,7 +367,7 @@ public class X509CertSelector implements CertSelector, Cloneable * Sets the authority key identifier criterion, or null to clear * this criterion. Note that the byte array is cloned to prevent modification. * - * @param subjectKeyId The subject key identifier. + * @param authKeyId The authority key identifier. */ public void setAuthorityKeyIdentifier(byte[] authKeyId) { -- cgit v1.1