diff options
author | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-25 16:45:15 +0100 |
---|---|---|
committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-25 16:45:15 +0100 |
commit | 28f7d9d05ad70afad626d4bc54c633d31eb7430a (patch) | |
tree | e9e280e2d95c4a16d714ee23d9f0345ef0401260 /libjava/java/security/KeyPair.java | |
parent | 744cfa53c3f98a0cb0d952a176c8bc03aee1abba (diff) | |
download | gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.zip gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.tar.gz gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.tar.bz2 |
decl.c (init_decl_processing): Add new class "protectionDomain" field.
gcc/java:
2001-04-25 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* decl.c (init_decl_processing): Add new class "protectionDomain"
field.
* class.c (make_class_data): Set initial value for "protectionDomain".
libjava:
2001-04-25 Bryce McKinlay <bryce@albatross.co.nz>
java.security merge and ClassLoader compliance fixes.
* java/lang/Class.h (Class): Include ProtectionDomain.h.
New protectionDomain field.
(forName): Add initialize parameter. Fixes declaration to comply with
JDK spec.
* java/lang/natClass.cc (forName): Correct declaration of the three-arg
variant. Honour "initialize" flag.
(getProtectionDomain0): New method.
* java/lang/Class.java: Fix forName() declaration.
(getPackage): New method based on Classpath implementation.
(getProtectionDomain0): New native method decl.
(getProtectionDomain): New method.
* java/lang/ClassLoader.java (getParent): Now final.
(definedPackages): New field.
(getPackage): New.
(defineClass): New variant with protectionDomain argument.
(definePackage): New.
(getPackages): New.
(findSystemClass): Now final.
(getSystemResourceAsStream): Remove redundant "final" modifier.
(getSystemResource): Remove redundant "final" modifier.
(getResources): Now final.
(protectionDomainPermission): New static field.
(unknownProtectionDomain): Ditto.
(defaultProtectionDomain): Ditto.
(getSystemClassLoader): Now non-native.
* java/util/ResourceBundle.java (tryGetSomeBundle): Use the correct
arguments for Class.forName().
* java/lang/Package.java: New file.
* gnu/gcj/runtime/VMClassLoader.java (getVMClassLoader): Removed.
(instance): Static initialize singleton.
(findClass): Override this, not findSystemClass.
* java/lang/natClassLoader.cc (defineClass0): Set class's
protectionDomain field as specified.
(getSystemClassLoader): Removed.
(findClass): Renamed from findSystemClass. Call the interpreter via
URLClassLoader.findClass if loading class via dlopen fails.
* java/security/*.java: java.security import/merge with Classpath.
* java/security/acl/*.java: Likewise.
* java/security/interfaces/*.java: Likewise.
* java/security/spec/*.java: Likewise.
* java/net/NetPermission.java: Likewise.
* java/net/SocketPermission.java: Likewise.
* gnu/java/security/provider/DefaultPolicy.java: Likewise.
* Makefile.am: Add new classes.
* Makefile.in: Rebuilt.
* gcj/javaprims.h: CNI namespace rebuild.
From-SVN: r41543
Diffstat (limited to 'libjava/java/security/KeyPair.java')
-rw-r--r-- | libjava/java/security/KeyPair.java | 73 |
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; } |