1 files changed, 53 insertions, 20 deletions

diff --git a/libjava/java/security/KeyPair.java b/libjava/java/security/KeyPair.java
index 0aeb7c3..f5c474a 100644
--- a/libjava/java/security/KeyPair.java
+++ b/libjava/java/security/KeyPair.java
@@ -1,41 +1,74 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* KeyPair.java --- Key Pair Class
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-   This file is part of libgcj.
+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.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
 package java.security;
+import java.io.Serializable;
 
 /**
- * @author Tom Tromey <tromey@cygnus.com>
- * @date February 9, 2000.
- */
+   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.
 
-/* Written using on-line Java Platform 1.2 API Specification.
- * Status:  Believed complete and correct.
+   @author Mark Benvenuto
  */
- 
-public class KeyPair implements java.io.Serializable
+public final class KeyPair implements Serializable
 {
-  public KeyPair (PublicKey publicKey, PrivateKey privateKey)
+  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;
   }
 
-  public PublicKey getPublic ()
+  /**
+     Returns the public key stored in the KeyPair
+
+     @return The public key
+   */
+  public PublicKey getPublic()
   {
     return publicKey;
   }
 
-  public PrivateKey getPrivate ()
+  /**
+     Returns the private key stored in the KeyPair
+
+     @return The private key
+   */
+  public PrivateKey getPrivate()
   {
     return privateKey;
   }
-
-  // The keys.
-  private PublicKey publicKey;
-  private PrivateKey privateKey;
 }