From b22dcb1f3071073b9521d72824eccad571c81613 Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Tue, 22 Feb 2005 18:58:53 +0000 Subject: 2005-02-22 Jeroen Frijters * java/io/Externalizable.java, java/io/Serializable.java (serialVersionUID): Removed. * java/rmi/server/RemoteObject.java, java/rmi/server/UID.java (serialVersionUID): Made private. * java/rmi/server/RemoteRef.java, java/rmi/server/ServerRef.java (serialVersionUID): Set proper value. * java/security/interfaces/DSAPrivateKey.java, java/security/interfaces/DSAPublicKey.java, java/security/interfaces/RSAMultiPrimePrivateCrtKey.java, java/security/interfaces/RSAPrivateCrtKey.java, java/security/interfaces/RSAPrivateKey.java, java/security/interfaces/RSAPublicKey.java, javax/crypto/SecretKey.java (serialVersionUID): Added. From-SVN: r95406 --- libjava/java/io/Externalizable.java | 2 -- libjava/java/io/Serializable.java | 1 - libjava/java/rmi/server/RemoteRef.java | 2 +- libjava/java/rmi/server/ServerRef.java | 2 +- libjava/java/security/interfaces/DSAPrivateKey.java | 5 +++++ libjava/java/security/interfaces/DSAPublicKey.java | 5 +++++ libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java | 1 + libjava/java/security/interfaces/RSAPrivateCrtKey.java | 2 ++ libjava/java/security/interfaces/RSAPrivateKey.java | 2 ++ libjava/java/security/interfaces/RSAPublicKey.java | 2 ++ 10 files changed, 19 insertions(+), 5 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/io/Externalizable.java b/libjava/java/io/Externalizable.java index 09080a0..71304e2 100644 --- a/libjava/java/io/Externalizable.java +++ b/libjava/java/io/Externalizable.java @@ -60,8 +60,6 @@ package java.io; */ public interface Externalizable extends Serializable { - long serialVersionUID = -282491828744381764L; - /** * This method restores an object's state by reading in the instance data * for the object from the passed in stream. Note that this stream is not diff --git a/libjava/java/io/Serializable.java b/libjava/java/io/Serializable.java index 065faae..1ca6638 100644 --- a/libjava/java/io/Serializable.java +++ b/libjava/java/io/Serializable.java @@ -51,5 +51,4 @@ package java.io; */ public interface Serializable { - long serialVersionUID = 1196656838076753133L; } // interface Serializable diff --git a/libjava/java/rmi/server/RemoteRef.java b/libjava/java/rmi/server/RemoteRef.java index a3f22c2..89cee12 100644 --- a/libjava/java/rmi/server/RemoteRef.java +++ b/libjava/java/rmi/server/RemoteRef.java @@ -46,7 +46,7 @@ import java.rmi.RemoteException; public interface RemoteRef extends Externalizable { - long serialVersionUID = 0; + long serialVersionUID = 3632638527362204081L; String packagePrefix = "gnu.java.rmi.server"; diff --git a/libjava/java/rmi/server/ServerRef.java b/libjava/java/rmi/server/ServerRef.java index a6e9867..906b126 100644 --- a/libjava/java/rmi/server/ServerRef.java +++ b/libjava/java/rmi/server/ServerRef.java @@ -43,7 +43,7 @@ import java.rmi.RemoteException; public interface ServerRef extends RemoteRef { - long serialVersionUID = 0; + long serialVersionUID = -4557750989390278438L; RemoteStub exportObject(Remote obj, Object data) throws RemoteException; diff --git a/libjava/java/security/interfaces/DSAPrivateKey.java b/libjava/java/security/interfaces/DSAPrivateKey.java index 4e6f13d..223db91 100644 --- a/libjava/java/security/interfaces/DSAPrivateKey.java +++ b/libjava/java/security/interfaces/DSAPrivateKey.java @@ -50,6 +50,11 @@ import java.security.PrivateKey; public interface DSAPrivateKey extends DSAKey, PrivateKey { /** + * The version identifier used for serialization. + */ + long serialVersionUID = 7776497482533790279L; + + /** * This method returns the value of the DSA private key */ BigInteger getX(); diff --git a/libjava/java/security/interfaces/DSAPublicKey.java b/libjava/java/security/interfaces/DSAPublicKey.java index aec1c60..3f8d211 100644 --- a/libjava/java/security/interfaces/DSAPublicKey.java +++ b/libjava/java/security/interfaces/DSAPublicKey.java @@ -50,6 +50,11 @@ import java.security.PublicKey; public interface DSAPublicKey extends DSAKey, PublicKey { /** + * The version identifier used for serialization. + */ + long serialVersionUID = 1234526332779022332L; + + /** * This method returns the value of the DSA public key */ BigInteger getY(); diff --git a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java index 7e115fa..68a5e44 100644 --- a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java +++ b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java @@ -54,6 +54,7 @@ public interface RSAMultiPrimePrivateCrtKey extends RSAPrivateKey { // Constants // -------------------------------------------------------------------------- + long serialVersionUID = 618058533534628008L; // Methods // -------------------------------------------------------------------------- diff --git a/libjava/java/security/interfaces/RSAPrivateCrtKey.java b/libjava/java/security/interfaces/RSAPrivateCrtKey.java index 8af1bb9..1fb2881 100644 --- a/libjava/java/security/interfaces/RSAPrivateCrtKey.java +++ b/libjava/java/security/interfaces/RSAPrivateCrtKey.java @@ -49,6 +49,8 @@ import java.math.BigInteger; */ public interface RSAPrivateCrtKey extends RSAPrivateKey { + long serialVersionUID = -5682214253527700368L; + /** * Returns the public exponent for this key * diff --git a/libjava/java/security/interfaces/RSAPrivateKey.java b/libjava/java/security/interfaces/RSAPrivateKey.java index d287d67..b4e3429 100644 --- a/libjava/java/security/interfaces/RSAPrivateKey.java +++ b/libjava/java/security/interfaces/RSAPrivateKey.java @@ -49,6 +49,8 @@ import java.security.PrivateKey; */ public interface RSAPrivateKey extends PrivateKey, RSAKey { + long serialVersionUID = 5187144804936595022L; + /** * Returns the private exponent value for this key * diff --git a/libjava/java/security/interfaces/RSAPublicKey.java b/libjava/java/security/interfaces/RSAPublicKey.java index 22d64b1..9847ae9 100644 --- a/libjava/java/security/interfaces/RSAPublicKey.java +++ b/libjava/java/security/interfaces/RSAPublicKey.java @@ -49,6 +49,8 @@ import java.security.PublicKey; */ public interface RSAPublicKey extends PublicKey, RSAKey { + long serialVersionUID = -8727434096241101194L; + /** * Returns the public exponent value for this key * -- cgit v1.1