diff options
author | Tom Tromey <tromey@redhat.com> | 2003-03-12 17:33:05 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2003-03-12 17:33:05 +0000 |
commit | 87e38c37956ee3791b6ddb9bc5470e5cd354d354 (patch) | |
tree | ad13b9b5dacc18ac1bcdd1d7651fa79a61757553 | |
parent | ad379c610b3606c9bc86e690181a5b5d3ed24406 (diff) | |
download | classpath-87e38c37956ee3791b6ddb9bc5470e5cd354d354.tar.gz |
* java/security/Signer.java: Removed non-ASCII characters.
* java/security/Signature.java: Removed non-ASCII characters.
* java/security/Security.java: Removed non-ASCII characters.
* java/security/Policy.java (getCurrentPolicy): Typo fix.
(isLoaded): Removed non-ASCII character.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | java/security/Policy.java | 4 | ||||
-rw-r--r-- | java/security/Security.java | 182 | ||||
-rw-r--r-- | java/security/Signature.java | 2 | ||||
-rw-r--r-- | java/security/Signer.java | 2 |
5 files changed, 103 insertions, 95 deletions
@@ -1,3 +1,11 @@ +2003-03-12 Tom Tromey <tromey@redhat.com> + + * java/security/Signer.java: Removed non-ASCII characters. + * java/security/Signature.java: Removed non-ASCII characters. + * java/security/Security.java: Removed non-ASCII characters. + * java/security/Policy.java (getCurrentPolicy): Typo fix. + (isLoaded): Removed non-ASCII character. + 2003-03-12 Sascha Brawer <brawer@acm.org> * java/util/logging/Level.java (OFF, SEVERE, WARNING, INFO, CONFIG, diff --git a/java/security/Policy.java b/java/security/Policy.java index e2fb89c8e..47171cff3 100644 --- a/java/security/Policy.java +++ b/java/security/Policy.java @@ -176,7 +176,7 @@ public abstract class Policy /** * Ensures/forces loading of the configured policy provider, while bypassing * the {@link SecurityManager} checks for <code>"getPolicy"</code> security - * permission. Nneeded by {@link ProtectionDomain}. + * permission. Needed by {@link ProtectionDomain}. */ static Policy getCurrentPolicy() { @@ -202,7 +202,7 @@ public abstract class Policy /** * Tests if <code>currentPolicy</code> is not <code>null</code>, * thus allowing clients to not force loading of any policy - * provider; needed by {@link ProtectionDomain}. + * provider; needed by {@link ProtectionDomain}. */ static boolean isLoaded() { diff --git a/java/security/Security.java b/java/security/Security.java index dc0b426d6..644678f2e 100644 --- a/java/security/Security.java +++ b/java/security/Security.java @@ -418,55 +418,55 @@ public final class Security extends Object } /** - * <p>Returns an array containing all installed providers that satisfy the -Â * specified selection criterion, or <code>null</code> if no such providers -Â * have been installed. The returned providers are ordered according to their -Â * preference order.</p> -Â * -Â * <p>A cryptographic service is always associated with a particular -Â * algorithm or type. For example, a digital signature service is always -Â * associated with a particular algorithm (e.g., <i>DSA</i>), and a -Â * CertificateFactory service is always associated with a particular -Â * certificate type (e.g., <i>X.509</i>).</p> -Â * -Â * <p>The selection criterion must be specified in one of the following two -Â * formats:</p> -Â * -Â * <ul> -Â * Â Â <li><p><crypto_service>.<algorithm_or_type></p> -Â * Â Â <p>The cryptographic service name must not contain any dots.</p> -Â * Â Â <p>A provider satisfies the specified selection criterion iff the -Â * Â Â provider implements the specified algorithm or type for the specified -Â * Â Â cryptographic service.</p> -Â * Â Â <p>For example, "CertificateFactory.X.509" would be satisfied by any -Â * Â Â provider that supplied a CertificateFactory implementation for X.509 -Â * Â Â certificates.</p></li> -Â * - * Â Â <li><p><crypto_service>.<algorithm_or_type> <attribute_name>:<attribute_value></p> -Â * Â Â <p>The cryptographic service name must not contain any dots. There must -Â * Â Â be one or more space charaters between the the <algorithm_or_type> -Â * Â Â and the <attribute_name>.</p> -Â * Â Â <p>A provider satisfies this selection criterion iff the provider -Â * Â Â implements the specified algorithm or type for the specified -Â * Â Â cryptographic service and its implementation meets the constraint -Â * Â Â expressed by the specified attribute name/value pair.</p> -Â * Â Â <p>For example, "Signature.SHA1withDSA KeySize:1024" would be satisfied -Â * Â Â by any provider that implemented the SHA1withDSA signature algorithm -Â * Â Â with a keysize of 1024 (or larger).</p></li> -Â * </ul> -Â * -Â * <p>See Appendix A in the Java Cryptogaphy Architecture API Specification -Â * & Reference for information about standard cryptographic service names, -Â * standard algorithm names and standard attribute names.</p> -Â * -Â * @param filter the criterion for selecting providers. The filter is case- -Â * insensitive. -Â * @return all the installed providers that satisfy the selection criterion, -Â * or null if no such providers have been installed. -Â * @throws InvalidParameterException if the filter is not in the required -Â * format. -Â * @see #getProviders(Map) - */ + * <p>Returns an array containing all installed providers that satisfy the + * specified selection criterion, or <code>null</code> if no such providers + * have been installed. The returned providers are ordered according to their + * preference order.</p> + * + * <p>A cryptographic service is always associated with a particular + * algorithm or type. For example, a digital signature service is always + * associated with a particular algorithm (e.g., <i>DSA</i>), and a + * CertificateFactory service is always associated with a particular + * certificate type (e.g., <i>X.509</i>).</p> + * + * <p>The selection criterion must be specified in one of the following two + * formats:</p> + * + * <ul> + * <li><p><crypto_service>.<algorithm_or_type></p> + * <p>The cryptographic service name must not contain any dots.</p> + * <p>A provider satisfies the specified selection criterion iff the + * provider implements the specified algorithm or type for the specified + * cryptographic service.</p> + * <p>For example, "CertificateFactory.X.509" would be satisfied by any + * provider that supplied a CertificateFactory implementation for X.509 + * certificates.</p></li> + * + * <li><p><crypto_service>.<algorithm_or_type> <attribute_name>:<attribute_value></p> + * <p>The cryptographic service name must not contain any dots. There must + * be one or more space charaters between the the <algorithm_or_type> + * and the <attribute_name>.</p> + * <p>A provider satisfies this selection criterion iff the provider + * implements the specified algorithm or type for the specified + * cryptographic service and its implementation meets the constraint + * expressed by the specified attribute name/value pair.</p> + * <p>For example, "Signature.SHA1withDSA KeySize:1024" would be satisfied + * by any provider that implemented the SHA1withDSA signature algorithm + * with a keysize of 1024 (or larger).</p></li> + * </ul> + * + * <p>See Appendix A in the Java Cryptogaphy Architecture API Specification + * & Reference for information about standard cryptographic service names, + * standard algorithm names and standard attribute names.</p> + * + * @param filter the criterion for selecting providers. The filter is case- + * insensitive. + * @return all the installed providers that satisfy the selection criterion, + * or null if no such providers have been installed. + * @throws InvalidParameterException if the filter is not in the required + * format. + * @see #getProviders(Map) + */ public static Provider[] getProviders(String filter) { if (providers == null || providers.isEmpty()) @@ -486,47 +486,47 @@ public final class Security extends Object } /** -Â * <p>Returns an array containing all installed providers that satisfy the -Â * specified selection criteria, or <code>null</code> if no such providers -Â * have been installed. The returned providers are ordered according to their -Â * preference order.</p> -Â * -Â * <p>The selection criteria are represented by a map. Each map entry -Â * represents a selection criterion. A provider is selected iff it satisfies -Â * all selection criteria. The key for any entry in such a map must be in one -Â * of the following two formats:</p> -Â * -Â * <ul> -Â * Â Â <li><p><crypto_service>.<algorithm_or_type></p> -Â * Â Â <p>The cryptographic service name must not contain any dots.</p> -Â * Â Â <p>The value associated with the key must be an empty string.</p> -Â * Â Â <p>A provider satisfies this selection criterion iff the provider -Â * Â Â implements the specified algorithm or type for the specified -Â * Â Â cryptographic service.</p></li> -Â * -Â * Â Â <li><p><crypto_service>.<algorithm_or_type> <attribute_name></p> -Â * Â Â <p>The cryptographic service name must not contain any dots. There must -Â * Â Â be one or more space charaters between the <algorithm_or_type> and -Â * Â Â the <attribute_name>.</p> -Â * Â Â <p>The value associated with the key must be a non-empty string. A -Â * Â Â provider satisfies this selection criterion iff the provider implements -Â * Â Â the specified algorithm or type for the specified cryptographic service - * Â Â and its implementation meets the constraint expressed by the specified -Â * Â Â attribute name/value pair.</p></li> -Â * </ul> -Â * -Â * <p>See Appendix A in the Java Cryptogaphy Architecture API Specification -Â * & Reference for information about standard cryptographic service names, -Â * standard algorithm names and standard attribute names.</p> -Â * -Â * @param filter the criteria for selecting providers. The filter is case- -Â * insensitive. -Â * @return all the installed providers that satisfy the selection criteria, -Â * or <code>null</code> if no such providers have been installed. -Â * @throws InvalidParameterException if the filter is not in the required -Â * format. -Â * @see #getProviders(String) -Â */ + * <p>Returns an array containing all installed providers that satisfy the + * specified selection criteria, or <code>null</code> if no such providers + * have been installed. The returned providers are ordered according to their + * preference order.</p> + * + * <p>The selection criteria are represented by a map. Each map entry + * represents a selection criterion. A provider is selected iff it satisfies + * all selection criteria. The key for any entry in such a map must be in one + * of the following two formats:</p> + * + * <ul> + * <li><p><crypto_service>.<algorithm_or_type></p> + * <p>The cryptographic service name must not contain any dots.</p> + * <p>The value associated with the key must be an empty string.</p> + * <p>A provider satisfies this selection criterion iff the provider + * implements the specified algorithm or type for the specified + * cryptographic service.</p></li> + * + * <li><p><crypto_service>.<algorithm_or_type> <attribute_name></p> + * <p>The cryptographic service name must not contain any dots. There must + * be one or more space charaters between the <algorithm_or_type> and + * the <attribute_name>.</p> + * <p>The value associated with the key must be a non-empty string. A + * provider satisfies this selection criterion iff the provider implements + * the specified algorithm or type for the specified cryptographic service + * and its implementation meets the constraint expressed by the specified + * attribute name/value pair.</p></li> + * </ul> + * + * <p>See Appendix A in the Java Cryptogaphy Architecture API Specification + * & Reference for information about standard cryptographic service names, + * standard algorithm names and standard attribute names.</p> + * + * @param filter the criteria for selecting providers. The filter is case- + * insensitive. + * @return all the installed providers that satisfy the selection criteria, + * or <code>null</code> if no such providers have been installed. + * @throws InvalidParameterException if the filter is not in the required + * format. + * @see #getProviders(String) + */ public static Provider[] getProviders(Map filter) { if (providers == null || providers.isEmpty()) @@ -677,7 +677,7 @@ public final class Security extends Object if (! realAttr.equalsIgnoreCase(attr)) continue; - // eveything matches so far. Â do the value + // eveything matches so far. do the value realVal = p.getProperty(key); if (realVal == null) return false; diff --git a/java/security/Signature.java b/java/security/Signature.java index 9858e318d..492807303 100644 --- a/java/security/Signature.java +++ b/java/security/Signature.java @@ -581,7 +581,7 @@ public abstract class Signature extends SignatureSpi * signature algorithm engine, the parameter is already set and cannot be set * again, a security exception occurs, and so on. * @see #getParameter(String) - * @deprecated Use setParameter(AlgorithmParameterSpec). + * @deprecated Use setParameter(AlgorithmParameterSpec). */ public final void setParameter(String param, Object value) throws InvalidParameterException diff --git a/java/security/Signer.java b/java/security/Signer.java index d126abc24..b5b3aaf19 100644 --- a/java/security/Signer.java +++ b/java/security/Signer.java @@ -46,7 +46,7 @@ package java.security; * use.</p> * * @author Mark Benvenuto <ivymccough@worldnet.att.net> - * @deprecated This class is no longer used. Its functionality has been replaced + * @deprecated This class is no longer used. Its functionality has been replaced * by <code>java.security.KeyStore</code>, the <code>java.security.cert</code> * package, and <code>java.security.Principal</code>. */ |