From b22dcb1f3071073b9521d72824eccad571c81613 Mon Sep 17 00:00:00 2001 From: Jeroen Frijters Date: Tue, 22 Feb 2005 18:58:53 +0000 Subject: [PATCH 1/1] 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/ChangeLog | 20 +++++++++++++++++++ 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 +- .../security/interfaces/DSAPrivateKey.java | 5 +++++ .../security/interfaces/DSAPublicKey.java | 5 +++++ .../RSAMultiPrimePrivateCrtKey.java | 1 + .../security/interfaces/RSAPrivateCrtKey.java | 2 ++ .../security/interfaces/RSAPrivateKey.java | 2 ++ .../security/interfaces/RSAPublicKey.java | 2 ++ libjava/javax/crypto/SecretKey.java | 1 + 12 files changed, 40 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cb31732b2d4..d36ba6f38c5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,23 @@ +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. + 2005-02-22 Tom Tromey * java/lang/Object.h (_JvObjectPrefix): Declare as extern "Java". diff --git a/libjava/java/io/Externalizable.java b/libjava/java/io/Externalizable.java index 09080a05831..71304e24abf 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 065faae80cf..1ca6638c874 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 a3f22c27a66..89cee1256b2 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 a6e986750ba..906b1269889 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 4e6f13ddbe5..223db91e806 100644 --- a/libjava/java/security/interfaces/DSAPrivateKey.java +++ b/libjava/java/security/interfaces/DSAPrivateKey.java @@ -49,6 +49,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 */ diff --git a/libjava/java/security/interfaces/DSAPublicKey.java b/libjava/java/security/interfaces/DSAPublicKey.java index aec1c606dcd..3f8d211d295 100644 --- a/libjava/java/security/interfaces/DSAPublicKey.java +++ b/libjava/java/security/interfaces/DSAPublicKey.java @@ -49,6 +49,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 */ diff --git a/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/libjava/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java index 7e115fabcd1..68a5e448877 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 8af1bb9168e..1fb2881ed50 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 d287d67327a..b4e34292340 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 22d64b1bb7a..9847ae9d257 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 * diff --git a/libjava/javax/crypto/SecretKey.java b/libjava/javax/crypto/SecretKey.java index ce7057e7092..3865db4a6d1 100644 --- a/libjava/javax/crypto/SecretKey.java +++ b/libjava/javax/crypto/SecretKey.java @@ -61,4 +61,5 @@ import java.security.Key; */ public interface SecretKey extends Key { + long serialVersionUID = -4795878709595146952L; } -- 2.30.2