From ce97e13dedadf5635b96807626bc2d005b9022bc Mon Sep 17 00:00:00 2001 From: mkoch Date: Tue, 20 Apr 2004 14:45:10 +0000 Subject: 2004-04-20 Michael Koch * java/rmi/MarshalledObject.java, java/rmi/Naming.java, java/rmi/RemoteException.java, java/rmi/activation/ActivationException.java, java/rmi/server/ServerCloneException.java, java/security/AccessController.java, java/security/AlgorithmParameterGenerator.java, java/security/AlgorithmParameters.java, java/security/CodeSource.java, java/security/Identity.java, java/security/IdentityScope.java, java/security/KeyPairGenerator.java, java/security/KeyStore.java, java/security/Security.java, java/security/Signature.java, java/security/SignatureSpi.java, java/security/SignedObject.java, java/security/spec/DSAParameterSpec.java, java/security/spec/DSAPrivateKeySpec.java, java/security/spec/DSAPublicKeySpec.java, java/sql/Array.java, java/sql/DatabaseMetaData.java, java/sql/ResultSet.java, java/text/ChoiceFormat.java, java/text/CollationElementIterator.java, java/text/CollationKey.java, java/text/Collator.java, java/text/DateFormat.java, java/text/DateFormatSymbols.java, java/text/DecimalFormatSymbols.java, java/text/Format.java, java/text/ParsePosition.java, java/text/RuleBasedCollator.java, java/text/SimpleDateFormat.java, java/text/StringCharacterIterator.java, java/util/Collections.java, java/util/PropertyResourceBundle.java, java/util/ResourceBundle.java, java/util/StringTokenizer.java, java/util/jar/Attributes.java, java/util/logging/ConsoleHandler.java, java/util/logging/LogManager.java, java/util/logging/MemoryHandler.java, java/util/logging/SocketHandler.java, javax/naming/NamingException.java: Fixed javadoc, coding style and argument names all over. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80906 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/security/AccessController.java | 10 ++-- .../java/security/AlgorithmParameterGenerator.java | 2 +- libjava/java/security/AlgorithmParameters.java | 2 +- libjava/java/security/CodeSource.java | 23 +++++--- libjava/java/security/Identity.java | 2 +- libjava/java/security/IdentityScope.java | 4 +- libjava/java/security/KeyPairGenerator.java | 69 +++++++++++----------- libjava/java/security/KeyStore.java | 2 +- libjava/java/security/Security.java | 6 +- libjava/java/security/Signature.java | 30 +++++----- libjava/java/security/SignatureSpi.java | 2 +- libjava/java/security/SignedObject.java | 2 +- libjava/java/security/spec/DSAParameterSpec.java | 4 +- libjava/java/security/spec/DSAPrivateKeySpec.java | 4 +- libjava/java/security/spec/DSAPublicKeySpec.java | 4 +- 15 files changed, 86 insertions(+), 80 deletions(-) (limited to 'libjava/java/security') diff --git a/libjava/java/security/AccessController.java b/libjava/java/security/AccessController.java index 41ca1cec5fb..66aed9e3898 100644 --- a/libjava/java/security/AccessController.java +++ b/libjava/java/security/AccessController.java @@ -1,5 +1,5 @@ /* AccessController.java --- Access control context and permission checker - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public final class AccessController * * @param action the PrivilegedAction whose run() * should be be called. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. */ public static Object doPrivileged(PrivilegedAction action) { @@ -110,7 +110,7 @@ public final class AccessController * should be be called. * @param context the AccessControlContext whose protection * domains should be added to the protection domain of the calling class. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. */ public static Object doPrivileged(PrivilegedAction action, AccessControlContext context) @@ -130,7 +130,7 @@ public final class AccessController * * @param action the PrivilegedExceptionAction whose * run() should be be called. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ @@ -162,7 +162,7 @@ public final class AccessController * run() should be be called. * @param context the AccessControlContext whose protection * domains should be added to the protection domain of the calling class. - * @returns the result of the action.run() method. + * @return the result of the action.run() method. * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ diff --git a/libjava/java/security/AlgorithmParameterGenerator.java b/libjava/java/security/AlgorithmParameterGenerator.java index 26a7790d37a..034302504f0 100644 --- a/libjava/java/security/AlgorithmParameterGenerator.java +++ b/libjava/java/security/AlgorithmParameterGenerator.java @@ -67,7 +67,7 @@ import gnu.java.security.Engine; * system parameters, for example, the parameter generation values usually * consist of the size of the prime modulus and the size of the random * exponent, both specified in number of bits. - * * *

In case the client does not explicitly initialize the * AlgorithmParameterGenerator (via a call to an init() diff --git a/libjava/java/security/AlgorithmParameters.java b/libjava/java/security/AlgorithmParameters.java index 07d76bb7bab..86298b9ea93 100644 --- a/libjava/java/security/AlgorithmParameters.java +++ b/libjava/java/security/AlgorithmParameters.java @@ -71,7 +71,7 @@ import gnu.java.security.Engine; * parameter specification or parameter encoding.

* *

A transparent parameter specification is obtained from an - * AlgorithmParameters object via a call to + * AlgorithmParameters object via a call to * getParameterSpec(), and a byte encoding of the parameters is * obtained via a call to getEncoded().

* diff --git a/libjava/java/security/CodeSource.java b/libjava/java/security/CodeSource.java index 36ee734efd3..35ec573cd9b 100644 --- a/libjava/java/security/CodeSource.java +++ b/libjava/java/security/CodeSource.java @@ -159,17 +159,22 @@ public class CodeSource implements Serializable * object must have all the certifcates this object has (but may have more), * and must have a location that is a subset of this object's. In order * for this object to imply the specified object, the following must be - * true:
    + * true: + * + *
      *
    1. codesource must not be null.
      2. *
    2. If codesource has a certificate list, all of it's * certificates must be present in the certificate list of this * code source.
      3. *
    3. If this object does not have a null location, then - * the following addtional tests must be passed.
        + * the following addtional tests must be passed. + * + *
          *
        1. codesource must not have a null * location.
          2. *
        2. codesource's location must be equal to this object's - * location, or
            + * location, or + *
              *
            • codesource's location protocol, port, and ref (aka, * anchor) must equal this objects
              • *
            • codesource's location host must imply this object's @@ -183,19 +188,21 @@ public class CodeSource implements Serializable * location file must start with this object's location file * with the '/' character appended to it.
              • *
            - *
        + *
      4. *
    * *

    For example, each of these locations imply the location - * "http://java.sun.com/classes/foo.jar":

      + * "http://java.sun.com/classes/foo.jar":

      + * * 
          * http:
    * http://*.sun.com/classes/*
    * http://java.sun.com/classes/-
    * http://java.sun.com/classes/foo.jar
    *
      - * Note that the code source with null location and null certificates implies - * all other code sources. + * + *

      Note that the code source with null location and null certificates implies + * all other code sources.

      * * @param cs the CodeSource to test against this object * @return true if this specified CodeSource is implied @@ -245,7 +252,7 @@ public class CodeSource implements Serializable /** * This method returns a String that represents this object. * The result is in the format "(" + getLocation() followed - * by a space separated list of certificates (or ""), + * by a space separated list of certificates (or "<no certificates>"), * followed by ")". * * @return a String for this object diff --git a/libjava/java/security/Identity.java b/libjava/java/security/Identity.java index 57ccc83e056..2e9ddea1a29 100644 --- a/libjava/java/security/Identity.java +++ b/libjava/java/security/Identity.java @@ -151,7 +151,7 @@ public abstract class Identity implements Principal, Serializable * @throws KeyManagementException if another identity in the identity's scope * has the same public key, or if another exception occurs. * @throws SecurityException if a security manager exists and its - * checkSecurityAccess() method doesn't allow setting the public + * checkSecurityAccess() method doesn't allow setting the public * key. * @see #getPublicKey() * @see SecurityManager#checkSecurityAccess(String) diff --git a/libjava/java/security/IdentityScope.java b/libjava/java/security/IdentityScope.java index 88e00fc81c0..5965a00a122 100644 --- a/libjava/java/security/IdentityScope.java +++ b/libjava/java/security/IdentityScope.java @@ -123,7 +123,7 @@ public abstract class IdentityScope extends Identity } /** - *

      Sets the system's identity scope.

      + * Sets the system's identity scope. * *

      First, if there is a security manager, its checkSecurityAccess() * method is called with "setSystemScope" as its argument @@ -131,7 +131,7 @@ public abstract class IdentityScope extends Identity * * @param scope the scope to set. * @throws SecurityException if a security manager exists and its - * checkSecurityAccess() method doesn't allow setting the + * checkSecurityAccess() method doesn't allow setting the * identity scope. * @see #getSystemScope() * @see SecurityManager#checkSecurityAccess(String) diff --git a/libjava/java/security/KeyPairGenerator.java b/libjava/java/security/KeyPairGenerator.java index b9b07852aa4..9a3a04d4ef8 100644 --- a/libjava/java/security/KeyPairGenerator.java +++ b/libjava/java/security/KeyPairGenerator.java @@ -56,43 +56,42 @@ import gnu.java.security.Engine; * two is the initialization of the object:

      * *
        - *
      • Algorithm-Independent Initialization
        - * All key pair generators share the concepts of a keysize and a - * source of randomness. The keysize is interpreted differently - * for different algorithms (e.g., in the case of the DSA algorithm, - * the keysize corresponds to the length of the modulus). There is an - * initialize() method in this KeyPairGenerator - * class that takes these two universally shared types of arguments. There - * is also one that takes just a keysize argument, and uses the - * {@link SecureRandom} implementation of the highest-priority installed - * provider as the source of randomness. (If none of the installed - * providers supply an implementation of {@link SecureRandom}, a - * system-provided source of randomness is used.)

        + *
      • Algorithm-Independent Initialization
        + * All key pair generators share the concepts of a keysize and a + * source of randomness. The keysize is interpreted differently + * for different algorithms (e.g., in the case of the DSA algorithm, + * the keysize corresponds to the length of the modulus). There is an + * initialize() method in this KeyPairGenerator + * class that takes these two universally shared types of arguments. There + * is also one that takes just a keysize argument, and uses the + * {@link SecureRandom} implementation of the highest-priority installed + * provider as the source of randomness. (If none of the installed + * providers supply an implementation of {@link SecureRandom}, a + * system-provided source of randomness is used.) * - * Since no other parameters are specified when you call the above - * algorithm-independent initialize methods, it is up to the provider what - * to do about the algorithm-specific parameters (if any) to be associated - * with each of the keys.

        + *

        Since no other parameters are specified when you call the above + * algorithm-independent initialize methods, it is up to the provider what + * to do about the algorithm-specific parameters (if any) to be associated + * with each of the keys.

        * - * If the algorithm is the DSA algorithm, and the keysize - * (modulus size) is 512, 768, or 1024, - * then the GNU provider uses a set of precomputed values for the - * p, q, and g parameters. If the - * modulus size is not one of the above values, the GNU - * provider creates a new set of parameters. Other providers might have - * precomputed parameter sets for more than just the three modulus sizes - * mentioned above. Still others might not have a list of precomputed - * parameters at all and instead always create new parameter sets.
        • - * - *
      • Algorithm-Specific Initialization
        - * For situations where a set of algorithm-specific parameters already - * exists (e.g., so-called community parameters in DSA), there - * are two initialize methods that have an {@link AlgorithmParameterSpec} - * argument. One also has a {@link SecureRandom} argument, while the the - * other uses the {@link SecureRandom} implementation of the highest-priority - * installed provider as the source of randomness. (If none of the installed - * providers supply an implementation of {@link SecureRandom}, a - * system-provided source of randomness is used.)
        • + *

        If the algorithm is the DSA algorithm, and the keysize + * (modulus size) is 512, 768, or 1024, + * then the GNU provider uses a set of precomputed values for the + * p, q, and g parameters. If the + * modulus size is not one of the above values, the GNU + * provider creates a new set of parameters. Other providers might have + * precomputed parameter sets for more than just the three modulus sizes + * mentioned above. Still others might not have a list of precomputed + * parameters at all and instead always create new parameter sets.

        + *
      • Algorithm-Specific Initialization
        + * For situations where a set of algorithm-specific parameters already + * exists (e.g., so-called community parameters in DSA), there + * are two initialize methods that have an {@link AlgorithmParameterSpec} + * argument. One also has a {@link SecureRandom} argument, while the the + * other uses the {@link SecureRandom} implementation of the highest-priority + * installed provider as the source of randomness. (If none of the installed + * providers supply an implementation of {@link SecureRandom}, a + * system-provided source of randomness is used.)
        • *
      * *

      In case the client does not explicitly initialize the diff --git a/libjava/java/security/KeyStore.java b/libjava/java/security/KeyStore.java index 5f0c159d7d2..4ca16a2290e 100644 --- a/libjava/java/security/KeyStore.java +++ b/libjava/java/security/KeyStore.java @@ -208,7 +208,7 @@ public class KeyStore /** * Returns the default KeyStore type. This method looks up the - * type in /lib/security/java.security with the + * type in <JAVA_HOME>/lib/security/java.security with the * property "keystore.type" or if that fails then "jks" . */ public static final String getDefaultType() diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index ef716150ab4..d7edf20656f 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -1,5 +1,5 @@ /* Security.java --- Java base security class implementation - Copyright (C) 1999, 2001, 2002, 2003, Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ import java.util.Vector; * * @author Mark Benvenuto */ -public final class Security extends Object +public final class Security { private static final String ALG_ALIAS = "Alg.Alias."; @@ -670,7 +670,7 @@ public final class Security extends Object outer: for (int r = 0; r < 3; r++) // guard against circularity { serviceDotAlgorithm = (svc+"."+String.valueOf(algo)).trim(); - inner: for (it = p.keySet().iterator(); it.hasNext(); ) + for (it = p.keySet().iterator(); it.hasNext(); ) { key = (String) it.next(); if (key.equalsIgnoreCase(serviceDotAlgorithm)) // eureka diff --git a/libjava/java/security/Signature.java b/libjava/java/security/Signature.java index 1e99a7bb3e0..bf614e388b3 100644 --- a/libjava/java/security/Signature.java +++ b/libjava/java/security/Signature.java @@ -83,20 +83,20 @@ import gnu.java.security.Engine; * either signing data or verifying a signature:

      * *
        - *
      1. Initialization, with either - *
          - *
        • a public key, which initializes the signature for verification - * (see initVerify()), or
          • - *
        • a private key (and optionally a Secure Random Number Generator), - * which initializes the signature for signing (see - * {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)} - * ).
          • - *
        2. - *
      2. Updating
        - * Depending on the type of initialization, this will update the bytes to - * be signed or verified. See the update methods.
        3. - *
      3. Signing or Verifying a signature on all updated bytes. See the - * sign() methods and the verify() method.
        4. + *
      4. Initialization, with either + *
          + *
        • a public key, which initializes the signature for verification + * (see initVerify()), or
          • + *
        • a private key (and optionally a Secure Random Number Generator), + * which initializes the signature for signing (see + * {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)} + * ).
          • + *
        5. + *
      5. Updating
        + * Depending on the type of initialization, this will update the bytes to + * be signed or verified. See the update methods.
        6. + *
      6. Signing or Verifying a signature on all updated bytes. See the + * sign() methods and the verify() method.
        7. *
      * *

      Note that this class is abstract and extends from {@link SignatureSpi} for @@ -105,7 +105,7 @@ import gnu.java.security.Engine; * superclass are intended for cryptographic service providers who wish to * supply their own implementations of digital signature algorithms. * - * @author Mark Benvenuto + * @author Mark Benvenuto (ivymccough@worldnet.att.net) */ public abstract class Signature extends SignatureSpi { diff --git a/libjava/java/security/SignatureSpi.java b/libjava/java/security/SignatureSpi.java index 7deafd6b041..bf2382d8e40 100644 --- a/libjava/java/security/SignatureSpi.java +++ b/libjava/java/security/SignatureSpi.java @@ -279,7 +279,7 @@ public abstract class SignatureSpi * @param param the string name of the parameter. * @return the object that represents the parameter value, or null * if there is none. - * @throws InvalidParameterException if param is an invalid + * @throws InvalidParameterException if param is an invalid * parameter for this engine, or another exception occurs while trying to get * this parameter. * @deprecated diff --git a/libjava/java/security/SignedObject.java b/libjava/java/security/SignedObject.java index 270936ba686..0d9f733e70d 100644 --- a/libjava/java/security/SignedObject.java +++ b/libjava/java/security/SignedObject.java @@ -98,7 +98,7 @@ import java.io.Serializable; *

      The signature algorithm can be, among others, the NIST standard DSS, * using DSA and SHA-1. The algorithm is specified using the same * convention as that for signatures. The DSA algorithm using the - * SHA-1 message digest algorithm can be specified, for example, as + * SHA-1 message digest algorithm can be specified, for example, as * "SHA/DSA" or "SHA-1/DSA" (they are equivalent). In * the case of RSA, there are multiple choices for the message digest * algorithm, so the signing algorithm could be specified as, for example, diff --git a/libjava/java/security/spec/DSAParameterSpec.java b/libjava/java/security/spec/DSAParameterSpec.java index fa0ebce7a7a..5c7911f7420 100644 --- a/libjava/java/security/spec/DSAParameterSpec.java +++ b/libjava/java/security/spec/DSAParameterSpec.java @@ -1,5 +1,5 @@ /* DSAParameterSpec.java --- DSA Parameter Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAParameterSpec extends Object implements AlgorithmParameterSpec, DSAParams +public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams { private BigInteger p = null; private BigInteger q = null; diff --git a/libjava/java/security/spec/DSAPrivateKeySpec.java b/libjava/java/security/spec/DSAPrivateKeySpec.java index b4025d61cb3..c148481ca50 100644 --- a/libjava/java/security/spec/DSAPrivateKeySpec.java +++ b/libjava/java/security/spec/DSAPrivateKeySpec.java @@ -1,5 +1,5 @@ /* DSAPrivateKeySpec.java --- DSA Private Key Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAPrivateKeySpec extends Object implements KeySpec +public class DSAPrivateKeySpec implements KeySpec { private BigInteger x = null; private BigInteger p = null; diff --git a/libjava/java/security/spec/DSAPublicKeySpec.java b/libjava/java/security/spec/DSAPublicKeySpec.java index ef73371188a..687f8dd10fd 100644 --- a/libjava/java/security/spec/DSAPublicKeySpec.java +++ b/libjava/java/security/spec/DSAPublicKeySpec.java @@ -1,5 +1,5 @@ /* DSAPublicKeySpec.java --- DSA Public Key Specificaton class - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.math.BigInteger; @author Mark Benvenuto */ -public class DSAPublicKeySpec extends Object implements KeySpec +public class DSAPublicKeySpec implements KeySpec { private BigInteger y = null; private BigInteger p = null; -- cgit v1.2.3