From: Michael Koch Date: Sat, 10 May 2003 07:12:48 +0000 (+0000) Subject: Identity.java, [...]: New versions from classpath. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d133a9fd0ad04a73cac6183f894b3fdd8e3104b;p=gcc.git Identity.java, [...]: New versions from classpath. 2003-05-10 Michael Koch * java/security/Identity.java, java/security/IdentityScope.java, java/security/Key.java, java/security/KeyPair.java, java/security/PrivateKey.java, java/security/Provider.java, java/security/PublicKey.java, java/security/SecureRandom.java, java/security/SecureRandomSpi.java, java/security/SignedObject.java, java/security/Signer.java, java/security/cert/Certificate.java, java/security/cert/PKIXCertPathBuilderResult.java, java/security/cert/X509Certificate.java: New versions from classpath. From-SVN: r66655 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e957aebe016..e39bbf83d4f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,21 @@ +2003-05-10 Michael Koch + + * java/security/Identity.java, + java/security/IdentityScope.java, + java/security/Key.java, + java/security/KeyPair.java, + java/security/PrivateKey.java, + java/security/Provider.java, + java/security/PublicKey.java, + java/security/SecureRandom.java, + java/security/SecureRandomSpi.java, + java/security/SignedObject.java, + java/security/Signer.java, + java/security/cert/Certificate.java, + java/security/cert/PKIXCertPathBuilderResult.java, + java/security/cert/X509Certificate.java: + New versions from classpath. + 2003-05-09 Tom Tromey * Makefile.in: Rebuilt. diff --git a/libjava/java/security/Identity.java b/libjava/java/security/Identity.java index d44e96cc213..57ccc83e056 100644 --- a/libjava/java/security/Identity.java +++ b/libjava/java/security/Identity.java @@ -69,7 +69,7 @@ import java.util.Vector; */ public abstract class Identity implements Principal, Serializable { - static final long serialVersionUID = 3609922007826600659L; + private static final long serialVersionUID = 3609922007826600659L; private String name; private IdentityScope scope; diff --git a/libjava/java/security/IdentityScope.java b/libjava/java/security/IdentityScope.java index 200b3c6867a..88e00fc81c0 100644 --- a/libjava/java/security/IdentityScope.java +++ b/libjava/java/security/IdentityScope.java @@ -70,7 +70,7 @@ import java.util.Enumeration; */ public abstract class IdentityScope extends Identity { - static final long serialVersionUID = -2337346281189773310L; + private static final long serialVersionUID = -2337346281189773310L; private static IdentityScope systemScope = null; /** diff --git a/libjava/java/security/Key.java b/libjava/java/security/Key.java index 195e50bb527..ee2be037588 100644 --- a/libjava/java/security/Key.java +++ b/libjava/java/security/Key.java @@ -64,7 +64,7 @@ public interface Key extends Serializable /** * The version identifier used for serialization. */ - long serialVersionUID = 6603384152749567654L; + public static final long serialVersionUID = 6603384152749567654L; /** * This method returns the name of the algorithm for this key. This is a diff --git a/libjava/java/security/KeyPair.java b/libjava/java/security/KeyPair.java index c502add5002..a2b2fba76e5 100644 --- a/libjava/java/security/KeyPair.java +++ b/libjava/java/security/KeyPair.java @@ -48,7 +48,7 @@ import java.io.Serializable; */ public final class KeyPair implements Serializable { - static final long serialVersionUID = -7565189502268009837L; + private static final long serialVersionUID = -7565189502268009837L; private PublicKey publicKey; private PrivateKey privateKey; diff --git a/libjava/java/security/PrivateKey.java b/libjava/java/security/PrivateKey.java index 40b97f58b9a..53d898318d1 100644 --- a/libjava/java/security/PrivateKey.java +++ b/libjava/java/security/PrivateKey.java @@ -58,5 +58,5 @@ public interface PrivateKey extends Key /** * The version identifier used for serialization. */ - long serialVersionUID = 6034044314589513430L; + public static final long serialVersionUID = 6034044314589513430L; } // interface PrivateKey diff --git a/libjava/java/security/Provider.java b/libjava/java/security/Provider.java index 4b574b4da05..7a2bd66bb3c 100644 --- a/libjava/java/security/Provider.java +++ b/libjava/java/security/Provider.java @@ -56,7 +56,7 @@ import java.util.Properties; */ public abstract class Provider extends Properties implements Serializable { - static final long serialVersionUID = -4298000515446427739L; + private static final long serialVersionUID = -4298000515446427739L; /** * This is a textual description of the provider diff --git a/libjava/java/security/PublicKey.java b/libjava/java/security/PublicKey.java index 81ab764615f..9b013ec0a60 100644 --- a/libjava/java/security/PublicKey.java +++ b/libjava/java/security/PublicKey.java @@ -56,5 +56,5 @@ public interface PublicKey extends Key /** * The version identifier used for serialization. */ - long serialVersionUID = 7187392471159151072L; + public static final long serialVersionUID = 7187392471159151072L; } // interface PublicKey diff --git a/libjava/java/security/SecureRandom.java b/libjava/java/security/SecureRandom.java index 022d014cf1c..56f4b22672c 100644 --- a/libjava/java/security/SecureRandom.java +++ b/libjava/java/security/SecureRandom.java @@ -62,7 +62,7 @@ public class SecureRandom extends Random /** Service name for PRNGs. */ private static final String SECURE_RANDOM = "SecureRandom"; - static final long serialVersionUID = 4940670005562187L; + private static final long serialVersionUID = 4940670005562187L; //Serialized Field long counter = 0; //Serialized diff --git a/libjava/java/security/SecureRandomSpi.java b/libjava/java/security/SecureRandomSpi.java index 1586994d596..6831173688f 100644 --- a/libjava/java/security/SecureRandomSpi.java +++ b/libjava/java/security/SecureRandomSpi.java @@ -50,7 +50,7 @@ import java.io.Serializable; */ public abstract class SecureRandomSpi implements Serializable { - static final long serialVersionUID = -2991854161009191830L; + private static final long serialVersionUID = -2991854161009191830L; /** Default Constructor for SecureRandomSpi diff --git a/libjava/java/security/SignedObject.java b/libjava/java/security/SignedObject.java index 6a8d612b7fc..270936ba686 100644 --- a/libjava/java/security/SignedObject.java +++ b/libjava/java/security/SignedObject.java @@ -129,7 +129,7 @@ import java.io.Serializable; */ public final class SignedObject implements Serializable { - static final long serialVersionUID = 720502720485447167L; + private static final long serialVersionUID = 720502720485447167L; /** @serial */ private byte[] content; diff --git a/libjava/java/security/Signer.java b/libjava/java/security/Signer.java index b5b3aaf19aa..425933a8cea 100644 --- a/libjava/java/security/Signer.java +++ b/libjava/java/security/Signer.java @@ -52,7 +52,7 @@ package java.security; */ public abstract class Signer extends Identity { - static final long serialVersionUID = -1763464102261361480L; + private static final long serialVersionUID = -1763464102261361480L; private PrivateKey privateKey = null; /** diff --git a/libjava/java/security/cert/Certificate.java b/libjava/java/security/cert/Certificate.java index bcb206d0c7a..f4aff41d35e 100644 --- a/libjava/java/security/cert/Certificate.java +++ b/libjava/java/security/cert/Certificate.java @@ -47,6 +47,7 @@ import java.io.ObjectInputStream; import java.io.ByteArrayInputStream; import java.io.InvalidObjectException; import java.io.ObjectStreamException; +import java.io.Serializable; /** * The Certificate class is an abstract class used to manage @@ -71,9 +72,9 @@ import java.io.ObjectStreamException; * @author Mark Benvenuto * @author Casey Marshall */ -public abstract class Certificate +public abstract class Certificate implements Serializable { - static final long serialVersionUID = -6751606818319535583L; + private static final long serialVersionUID = -6751606818319535583L; private String type; @@ -227,7 +228,7 @@ public abstract class Certificate * @throws ObjectStreamException If the replacement could not be * created. */ - public Object writeReplace() throws ObjectStreamException + protected Object writeReplace() throws ObjectStreamException { try { diff --git a/libjava/java/security/cert/PKIXCertPathBuilderResult.java b/libjava/java/security/cert/PKIXCertPathBuilderResult.java index e423f64df4c..4c9cd67f52d 100644 --- a/libjava/java/security/cert/PKIXCertPathBuilderResult.java +++ b/libjava/java/security/cert/PKIXCertPathBuilderResult.java @@ -47,6 +47,7 @@ package java.security.cert; * @see CertPathBuilderResult */ public class PKIXCertPathBuilderResult extends PKIXCertPathValidatorResult + implements CertPathBuilderResult { // Fields. diff --git a/libjava/java/security/cert/X509Certificate.java b/libjava/java/security/cert/X509Certificate.java index cce1e535cc4..413fea08ca3 100644 --- a/libjava/java/security/cert/X509Certificate.java +++ b/libjava/java/security/cert/X509Certificate.java @@ -142,6 +142,7 @@ import java.util.Date; */ public abstract class X509Certificate extends Certificate implements X509Extension { + private static final long serialVersionUID = -2491127588187038216L; /** * Constructs a new certificate of the specified type.