[kaffe] CVS kaffe (robilad): Replaced KeyPair by implementation from GNU Classpath

[Kaffe CVS]

PatchSet 5206 
Date: 2004/09/22 08:44:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Replaced KeyPair by implementation from GNU Classpath

2004-09-22  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/security/KeyPair.java:
        Replaced by implementation from GNU Classpath.

Members: 
	ChangeLog:1.2761->1.2762 
	libraries/javalib/java/security/KeyPair.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2761 kaffe/ChangeLog:1.2762
--- kaffe/ChangeLog:1.2761	Wed Sep 22 08:11:06 2004
+++ kaffe/ChangeLog	Wed Sep 22 08:44:05 2004
@@ -1,5 +1,10 @@
 2004-09-22  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/security/KeyPair.java:
+        Replaced by implementation from GNU Classpath.
+
+2004-09-22  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/security/GuardedObject.java:
         Replaced by implementation from GNU Classpath.
 
Index: kaffe/libraries/javalib/java/security/KeyPair.java
diff -u kaffe/libraries/javalib/java/security/KeyPair.java:1.1 kaffe/libraries/javalib/java/security/KeyPair.java:1.2
--- kaffe/libraries/javalib/java/security/KeyPair.java:1.1	Fri Oct 15 01:12:15 1999
+++ kaffe/libraries/javalib/java/security/KeyPair.java	Wed Sep 22 08:44:07 2004
@@ -1,37 +1,87 @@
+/* KeyPair.java --- Key Pair Class
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- *	Archie L. Cobbs.  All rights reserved.
- * Copyright (c) 1999
- *	Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <archie at whistle.com>
- */
- 
-package java.security;
+This file is part of GNU Classpath.
 
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.security;
 import java.io.Serializable;
 
-public final class KeyPair implements Serializable {
-	private final PublicKey publicKey;
-	private final PrivateKey privateKey;
-
-	public KeyPair(PublicKey publicKey, PrivateKey privateKey) {
-		this.publicKey = publicKey;
-		this.privateKey = privateKey;
-	}
-
-	public PublicKey getPublic() {
-		return publicKey;
-	}
-
-	public PrivateKey getPrivate() {
-		return privateKey;
-	}
-}
+/**
+   KeyPair serves as a simple container for public and private keys.
+   If properly initialized, this class should be treated like the
+   private key since it contains it and take approriate security
+   measures.
 
+   @author Mark Benvenuto
+ */
+public final class KeyPair implements Serializable
+{
+  private static final long serialVersionUID = -7565189502268009837L;
+
+  private PublicKey publicKey;
+  private PrivateKey privateKey;
+
+  /**
+     Initializes the KeyPair with a pubilc and private key.
+
+     @param publicKey Public Key to store
+     @param privateKey Private Key to store
+   */
+  public KeyPair(PublicKey publicKey, PrivateKey privateKey)
+  {
+    this.publicKey = publicKey;
+    this.privateKey = privateKey;
+  }
+
+  /**
+     Returns the public key stored in the KeyPair
+
+     @return The public key
+   */
+  public PublicKey getPublic()
+  {
+    return publicKey;
+  }
+
+  /**
+     Returns the private key stored in the KeyPair
+
+     @return The private key
+   */
+  public PrivateKey getPrivate()
+  {
+    return privateKey;
+  }
+}