This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.security - classpath merges
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 10 May 2003 09:14:29 +0200
- Subject: FYI: Patch: java.security - classpath merges
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to merge java.security with classpath
again.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+vKbWWSOgCCdjSDsRApfGAJ9nEpoLHsff1doX8go3UXs6KuCGaACeNrZw
bEmbyCEz0yT0shTXxZarlW0=
=laR8
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1883
diff -u -b -B -r1.1883 ChangeLog
--- ChangeLog 9 May 2003 19:16:52 -0000 1.1883
+++ ChangeLog 10 May 2003 06:36:59 -0000
@@ -1,3 +1,21 @@
+2003-05-10 Michael Koch <konqueror@gmx.de>
+
+ * 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 <tromey@redhat.com>
* Makefile.in: Rebuilt.
Index: java/security/Identity.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Identity.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 Identity.java
--- java/security/Identity.java 19 Apr 2003 20:54:55 -0000 1.4
+++ java/security/Identity.java 10 May 2003 06:36:59 -0000
@@ -69,7 +69,7 @@
*/
public abstract class Identity implements Principal, Serializable
{
- static final long serialVersionUID = 3609922007826600659L;
+ private static final long serialVersionUID = 3609922007826600659L;
private String name;
private IdentityScope scope;
Index: java/security/IdentityScope.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/IdentityScope.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 IdentityScope.java
--- java/security/IdentityScope.java 19 Apr 2003 20:54:55 -0000 1.3
+++ java/security/IdentityScope.java 10 May 2003 06:36:59 -0000
@@ -70,7 +70,7 @@
*/
public abstract class IdentityScope extends Identity
{
- static final long serialVersionUID = -2337346281189773310L;
+ private static final long serialVersionUID = -2337346281189773310L;
private static IdentityScope systemScope = null;
/**
Index: java/security/Key.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Key.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 Key.java
--- java/security/Key.java 3 May 2003 16:20:48 -0000 1.8
+++ java/security/Key.java 10 May 2003 06:36:59 -0000
@@ -64,7 +64,7 @@
/**
* 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
Index: java/security/KeyPair.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/KeyPair.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 KeyPair.java
--- java/security/KeyPair.java 4 Oct 2002 20:15:07 -0000 1.5
+++ java/security/KeyPair.java 10 May 2003 06:36:59 -0000
@@ -48,7 +48,7 @@
*/
public final class KeyPair implements Serializable
{
- static final long serialVersionUID = -7565189502268009837L;
+ private static final long serialVersionUID = -7565189502268009837L;
private PublicKey publicKey;
private PrivateKey privateKey;
Index: java/security/PrivateKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/PrivateKey.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 PrivateKey.java
--- java/security/PrivateKey.java 3 May 2003 16:20:48 -0000 1.6
+++ java/security/PrivateKey.java 10 May 2003 06:36:59 -0000
@@ -58,5 +58,5 @@
/**
* The version identifier used for serialization.
*/
- long serialVersionUID = 6034044314589513430L;
+ public static final long serialVersionUID = 6034044314589513430L;
} // interface PrivateKey
Index: java/security/Provider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Provider.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 Provider.java
--- java/security/Provider.java 3 May 2003 16:20:48 -0000 1.8
+++ java/security/Provider.java 10 May 2003 06:36:59 -0000
@@ -56,7 +56,7 @@
*/
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
Index: java/security/PublicKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/PublicKey.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 PublicKey.java
--- java/security/PublicKey.java 3 May 2003 16:20:48 -0000 1.6
+++ java/security/PublicKey.java 10 May 2003 06:36:59 -0000
@@ -56,5 +56,5 @@
/**
* The version identifier used for serialization.
*/
- long serialVersionUID = 7187392471159151072L;
+ public static final long serialVersionUID = 7187392471159151072L;
} // interface PublicKey
Index: java/security/SecureRandom.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/SecureRandom.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 SecureRandom.java
--- java/security/SecureRandom.java 30 Apr 2003 07:23:41 -0000 1.10
+++ java/security/SecureRandom.java 10 May 2003 06:36:59 -0000
@@ -62,7 +62,7 @@
/** 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
Index: java/security/SecureRandomSpi.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/SecureRandomSpi.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 SecureRandomSpi.java
--- java/security/SecureRandomSpi.java 4 Oct 2002 20:15:07 -0000 1.3
+++ java/security/SecureRandomSpi.java 10 May 2003 06:36:59 -0000
@@ -50,7 +50,7 @@
*/
public abstract class SecureRandomSpi implements Serializable
{
- static final long serialVersionUID = -2991854161009191830L;
+ private static final long serialVersionUID = -2991854161009191830L;
/**
Default Constructor for SecureRandomSpi
Index: java/security/SignedObject.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/SignedObject.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 SignedObject.java
--- java/security/SignedObject.java 19 Apr 2003 20:54:55 -0000 1.5
+++ java/security/SignedObject.java 10 May 2003 06:36:59 -0000
@@ -129,7 +129,7 @@
*/
public final class SignedObject implements Serializable
{
- static final long serialVersionUID = 720502720485447167L;
+ private static final long serialVersionUID = 720502720485447167L;
/** @serial */
private byte[] content;
Index: java/security/Signer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Signer.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Signer.java
--- java/security/Signer.java 19 Apr 2003 20:54:55 -0000 1.3
+++ java/security/Signer.java 10 May 2003 06:36:59 -0000
@@ -52,7 +52,7 @@
*/
public abstract class Signer extends Identity
{
- static final long serialVersionUID = -1763464102261361480L;
+ private static final long serialVersionUID = -1763464102261361480L;
private PrivateKey privateKey = null;
/**
Index: java/security/cert/Certificate.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/cert/Certificate.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 Certificate.java
--- java/security/cert/Certificate.java 30 Apr 2003 07:23:42 -0000 1.4
+++ java/security/cert/Certificate.java 10 May 2003 06:37:05 -0000
@@ -47,6 +47,7 @@
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 @@
* @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 @@
* @throws ObjectStreamException If the replacement could not be
* created.
*/
- public Object writeReplace() throws ObjectStreamException
+ protected Object writeReplace() throws ObjectStreamException
{
try
{
Index: java/security/cert/PKIXCertPathBuilderResult.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/cert/PKIXCertPathBuilderResult.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 PKIXCertPathBuilderResult.java
--- java/security/cert/PKIXCertPathBuilderResult.java 30 Apr 2003 07:23:42 -0000 1.1
+++ java/security/cert/PKIXCertPathBuilderResult.java 10 May 2003 06:37:05 -0000
@@ -47,6 +47,7 @@
* @see CertPathBuilderResult
*/
public class PKIXCertPathBuilderResult extends PKIXCertPathValidatorResult
+ implements CertPathBuilderResult
{
// Fields.
Index: java/security/cert/X509Certificate.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/cert/X509Certificate.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 X509Certificate.java
--- java/security/cert/X509Certificate.java 30 Apr 2003 07:23:42 -0000 1.4
+++ java/security/cert/X509Certificate.java 10 May 2003 06:37:05 -0000
@@ -142,6 +142,7 @@
*/
public abstract class X509Certificate extends Certificate implements X509Extension
{
+ private static final long serialVersionUID = -2491127588187038216L;
/**
* Constructs a new certificate of the specified type.