diff --git a/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java b/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java index 95268601653..f5ece273052 100644 --- a/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java +++ b/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,6 +66,20 @@ import java.security.spec.AlgorithmParameterSpec; * default modulus prime size of 1024 bits for the generation of DSA * parameters. * + *

Every implementation of the Java platform is required to support the + * following standard AlgorithmParameterGenerator algorithms and + * keysizes in parentheses: + *

+ * These algorithms are described in the + * AlgorithmParameterGenerator section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * @author Jan Luehe * * @@ -126,9 +140,9 @@ public class AlgorithmParameterGenerator { * * @param algorithm the name of the algorithm this * parameter generator is associated with. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameterGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new AlgorithmParameterGenerator object. @@ -168,9 +182,9 @@ public class AlgorithmParameterGenerator { * * @param algorithm the name of the algorithm this * parameter generator is associated with. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameterGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the string name of the Provider. @@ -214,9 +228,9 @@ public class AlgorithmParameterGenerator { * * @param algorithm the string name of the algorithm this * parameter generator is associated with. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameterGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the Provider object. diff --git a/jdk/src/share/classes/java/security/AlgorithmParameters.java b/jdk/src/share/classes/java/security/AlgorithmParameters.java index 7dee113a215..a17e8487b72 100644 --- a/jdk/src/share/classes/java/security/AlgorithmParameters.java +++ b/jdk/src/share/classes/java/security/AlgorithmParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,6 +46,22 @@ import java.security.spec.InvalidParameterSpecException; * getParameterSpec, and a byte encoding of the parameters is * obtained via a call to getEncoded. * + *

Every implementation of the Java platform is required to support the + * following standard AlgorithmParameters algorithms: + *

+ * These algorithms are described in the + * AlgorithmParameters section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * @author Jan Luehe * * @@ -111,9 +127,9 @@ public class AlgorithmParameters { * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameters section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new parameter object. @@ -153,9 +169,9 @@ public class AlgorithmParameters { * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameters section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. @@ -200,9 +216,9 @@ public class AlgorithmParameters { * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the AlgorithmParameters section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. diff --git a/jdk/src/share/classes/java/security/KeyFactory.java b/jdk/src/share/classes/java/security/KeyFactory.java index f47f88b07ee..edc9724daf2 100644 --- a/jdk/src/share/classes/java/security/KeyFactory.java +++ b/jdk/src/share/classes/java/security/KeyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,8 +67,21 @@ import sun.security.jca.GetInstance.Instance; * sig.verify(signature); * * - * @author Jan Luehe + *

Every implementation of the Java platform is required to support the + * following standard KeyFactory algorithms: + *

+ * These algorithms are described in the + * KeyFactory section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. * + * @author Jan Luehe * * @see Key * @see PublicKey @@ -141,9 +154,9 @@ public class KeyFactory { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new KeyFactory object. @@ -172,9 +185,9 @@ public class KeyFactory { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. @@ -211,9 +224,9 @@ public class KeyFactory { * does not have to be registered in the provider list. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the provider. diff --git a/jdk/src/share/classes/java/security/KeyPairGenerator.java b/jdk/src/share/classes/java/security/KeyPairGenerator.java index 37f922af6ed..66e7e2ce7f9 100644 --- a/jdk/src/share/classes/java/security/KeyPairGenerator.java +++ b/jdk/src/share/classes/java/security/KeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -105,8 +105,22 @@ import sun.security.jca.GetInstance.Instance; * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of key pair generators. * - * @author Benjamin Renaud + *

Every implementation of the Java platform is required to support the + * following standard KeyPairGenerator algorithms and keysizes in + * parentheses: + *

+ * These algorithms are described in the + * KeyPairGenerator section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. * + * @author Benjamin Renaud * * @see java.security.spec.AlgorithmParameterSpec */ @@ -122,9 +136,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi { * Creates a KeyPairGenerator object for the specified algorithm. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyPairGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. */ protected KeyPairGenerator(String algorithm) { @@ -133,9 +147,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi { /** * Returns the standard name of the algorithm for this key pair generator. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyPairGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the standard string name of the algorithm. @@ -171,9 +185,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyPairGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new KeyPairGenerator object. @@ -227,9 +241,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyPairGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the string name of the provider. @@ -266,9 +280,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi { * does not have to be registered in the provider list. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyPairGenerator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the provider. diff --git a/jdk/src/share/classes/java/security/KeyStore.java b/jdk/src/share/classes/java/security/KeyStore.java index c1e2e4649e7..743f3593f31 100644 --- a/jdk/src/share/classes/java/security/KeyStore.java +++ b/jdk/src/share/classes/java/security/KeyStore.java @@ -164,8 +164,19 @@ import javax.security.auth.callback.*; * different passwords or other protection parameters * may also be used. * - * @author Jan Luehe + *

Every implementation of the Java platform is required to support + * the following standard KeyStore type: + *

+ * This type is described in the + * KeyStore section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other types are supported. * + * @author Jan Luehe * * @see java.security.PrivateKey * @see javax.crypto.SecretKey @@ -582,9 +593,9 @@ public class KeyStore { * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the type of keystore. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard keystore types. * * @return a keystore object of the specified type. @@ -620,9 +631,9 @@ public class KeyStore { * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the type of keystore. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard keystore types. * * @param provider the name of the provider. @@ -663,9 +674,9 @@ public class KeyStore { * does not have to be registered in the provider list. * * @param type the type of keystore. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the KeyStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard keystore types. * * @param provider the provider. diff --git a/jdk/src/share/classes/java/security/MessageDigest.java b/jdk/src/share/classes/java/security/MessageDigest.java index 5173ed97836..ce920fffbc0 100644 --- a/jdk/src/share/classes/java/security/MessageDigest.java +++ b/jdk/src/share/classes/java/security/MessageDigest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ import java.nio.ByteBuffer; /** * This MessageDigest class provides applications the functionality of a - * message digest algorithm, such as MD5 or SHA. + * message digest algorithm, such as SHA-1 or SHA-256. * Message digests are secure one-way hash functions that take arbitrary-sized * data and output a fixed-length hash value. * @@ -81,8 +81,21 @@ import java.nio.ByteBuffer; * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of message digest algorithms. * - * @author Benjamin Renaud + *

Every implementation of the Java platform is required to support + * the following standard MessageDigest algorithms: + *

+ * These algorithms are described in the + * MessageDigest section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. * + * @author Benjamin Renaud * * @see DigestInputStream * @see DigestOutputStream @@ -104,9 +117,9 @@ public abstract class MessageDigest extends MessageDigestSpi { * Creates a message digest with the specified algorithm name. * * @param algorithm the standard name of the digest algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the MessageDigest section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. */ protected MessageDigest(String algorithm) { @@ -127,9 +140,9 @@ public abstract class MessageDigest extends MessageDigestSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the MessageDigest section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return a Message Digest object that implements the specified algorithm. @@ -173,9 +186,9 @@ public abstract class MessageDigest extends MessageDigestSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the MessageDigest section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. @@ -222,9 +235,9 @@ public abstract class MessageDigest extends MessageDigestSpi { * does not have to be registered in the provider list. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the MessageDigest section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the provider. @@ -439,9 +452,9 @@ public abstract class MessageDigest extends MessageDigestSpi { * Returns a string that identifies the algorithm, independent of * implementation details. The name should be a standard * Java Security name (such as "SHA", "MD5", and so on). - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the MessageDigest section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the name of the algorithm diff --git a/jdk/src/share/classes/java/security/Policy.java b/jdk/src/share/classes/java/security/Policy.java index 8ae6d6c0eaf..b92d0625261 100644 --- a/jdk/src/share/classes/java/security/Policy.java +++ b/jdk/src/share/classes/java/security/Policy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,9 +67,6 @@ import sun.security.util.SecurityConstants; * implementation. In addition, an instance of a Policy object can be * constructed by invoking one of the getInstance factory methods * with a standard type. The default policy type is "JavaPolicy". - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference - * for a list of standard Policy types. * *

Once a Policy instance has been installed (either by default, or by * calling setPolicy), @@ -133,7 +130,7 @@ public abstract class Policy { * This method first calls * SecurityManager.checkPermission with a * SecurityPermission("getPolicy") permission - * to ensure it's ok to get the Policy object.. + * to ensure it's ok to get the Policy object. * * @return the installed Policy. * @@ -340,9 +337,10 @@ public abstract class Policy { *

Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * @param type the specified Policy type. See Appendix A in the - * - * Java Cryptography Architecture API Specification & Reference + * @param type the specified Policy type. See the Policy section in the + * + * Java Cryptography Architecture Standard Algorithm Name Documentation * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null. @@ -393,9 +391,10 @@ public abstract class Policy { *

Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * @param type the specified Policy type. See Appendix A in the - * - * Java Cryptography Architecture API Specification & Reference + * @param type the specified Policy type. See the Policy section in the + * + * Java Cryptography Architecture Standard Algorithm Name Documentation * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null. @@ -456,9 +455,10 @@ public abstract class Policy { * object is returned. Note that the specified Provider object * does not have to be registered in the provider list. * - * @param type the specified Policy type. See Appendix A in the - * - * Java Cryptography Architecture API Specification & Reference + * @param type the specified Policy type. See the Policy section in the + * + * Java Cryptography Architecture Standard Algorithm Name Documentation * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null. diff --git a/jdk/src/share/classes/java/security/SecureRandom.java b/jdk/src/share/classes/java/security/SecureRandom.java index 4243a778940..e51b6098558 100644 --- a/jdk/src/share/classes/java/security/SecureRandom.java +++ b/jdk/src/share/classes/java/security/SecureRandom.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -133,9 +133,9 @@ public class SecureRandom extends java.util.Random { *

Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - *

See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + *

See the SecureRandom section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard RNG algorithm names. * *

The returned SecureRandom object has not been seeded. To seed the @@ -171,9 +171,9 @@ public class SecureRandom extends java.util.Random { *

Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - *

See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + *

See the SecureRandom section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard RNG algorithm names. * * @param seed the seed. @@ -256,9 +256,9 @@ public class SecureRandom extends java.util.Random { * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the SecureRandom section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard RNG algorithm names. * * @return the new SecureRandom object. @@ -299,9 +299,9 @@ public class SecureRandom extends java.util.Random { * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the SecureRandom section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard RNG algorithm names. * * @param provider the name of the provider. @@ -347,9 +347,9 @@ public class SecureRandom extends java.util.Random { * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the SecureRandom section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard RNG algorithm names. * * @param provider the provider. diff --git a/jdk/src/share/classes/java/security/Security.java b/jdk/src/share/classes/java/security/Security.java index 81e029b8e96..5803243927e 100644 --- a/jdk/src/share/classes/java/security/Security.java +++ b/jdk/src/share/classes/java/security/Security.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -277,10 +277,11 @@ public final class Security { /** * Gets a specified property for an algorithm. The algorithm name - * should be a standard name. See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * should be a standard name. See the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. + * * One possible use is by specialized algorithm parsers, which may map * classes to algorithms which they understand (much like Key parsers * do). @@ -513,9 +514,9 @@ public final class Security { * * * - *

See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + *

See the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard cryptographic service names, standard * algorithm names and standard attribute names. * @@ -582,9 +583,9 @@ public final class Security { * constraint expressed by the specified attribute name/value pair. * * - *

See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + *

See the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard cryptographic service names, standard * algorithm names and standard attribute names. * diff --git a/jdk/src/share/classes/java/security/Signature.java b/jdk/src/share/classes/java/security/Signature.java index d303193a6f5..8e321f8946e 100644 --- a/jdk/src/share/classes/java/security/Signature.java +++ b/jdk/src/share/classes/java/security/Signature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +47,7 @@ import sun.security.jca.*; import sun.security.jca.GetInstance.Instance; /** - * This Signature class is used to provide applications the functionality + * The Signature class is used to provide applications the functionality * of a digital signature algorithm. Digital signatures are used for * authentication and integrity assurance of digital data. * @@ -98,6 +98,20 @@ import sun.security.jca.GetInstance.Instance; * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of digital signature algorithms. * + *

Every implementation of the Java platform is required to support the + * following standard Signature algorithms: + *

+ * These algorithms are described in the + * Signature section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * @author Benjamin Renaud * */ @@ -144,9 +158,9 @@ public abstract class Signature extends SignatureSpi { * Creates a Signature object for the specified algorithm. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the Signature section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. */ protected Signature(String algorithm) { @@ -184,9 +198,9 @@ public abstract class Signature extends SignatureSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the Signature section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new Signature object. @@ -303,9 +317,9 @@ public abstract class Signature extends SignatureSpi { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the Signature section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. @@ -353,9 +367,9 @@ public abstract class Signature extends SignatureSpi { * does not have to be registered in the provider list. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the Signature section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the provider. diff --git a/jdk/src/share/classes/java/security/cert/CertPath.java b/jdk/src/share/classes/java/security/cert/CertPath.java index 67e294dfd64..786360aa20f 100644 --- a/jdk/src/share/classes/java/security/cert/CertPath.java +++ b/jdk/src/share/classes/java/security/cert/CertPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -83,6 +83,19 @@ import java.util.List; * may not follow these conventions. PKIX CertPathValidators will * detect any departure from these conventions that cause the certification * path to be invalid and throw a CertPathValidatorException. + * + *

Every implementation of the Java platform is required to support the + * following standard CertPath encodings: + *

+ * These encodings are described in the + * CertPath Encodings section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other encodings are supported. *

* Concurrent Access *

diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java b/jdk/src/share/classes/java/security/cert/CertPathBuilder.java index 76210ff0984..99035c36af9 100644 --- a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java +++ b/jdk/src/share/classes/java/security/cert/CertPathBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,6 +52,19 @@ import sun.security.jca.GetInstance.Instance; * result (including the CertPath that was built) is returned * in an object that implements the CertPathBuilderResult * interface. + * + *

Every implementation of the Java platform is required to support the + * following standard CertPathBuilder algorithm: + *

+ * This algorithm is described in the + * CertPathBuilder section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * *

* Concurrent Access *

@@ -118,10 +131,10 @@ public class CertPathBuilder { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested CertPathBuilder - * algorithm. See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @return a CertPathBuilder object that implements the * specified algorithm. @@ -153,10 +166,10 @@ public class CertPathBuilder { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested CertPathBuilder - * algorithm. See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @param provider the name of the provider. * @@ -193,10 +206,10 @@ public class CertPathBuilder { * does not have to be registered in the provider list. * * @param algorithm the name of the requested CertPathBuilder - * algorithm. See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @param provider the provider. * diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidator.java b/jdk/src/share/classes/java/security/cert/CertPathValidator.java index e7b95602923..22cbb59b85d 100644 --- a/jdk/src/share/classes/java/security/cert/CertPathValidator.java +++ b/jdk/src/share/classes/java/security/cert/CertPathValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,6 +53,19 @@ import sun.security.jca.GetInstance.Instance; * and an algorithm-specific set of parameters. If successful, the result is * returned in an object that implements the * CertPathValidatorResult interface. + * + *

Every implementation of the Java platform is required to support the + * following standard CertPathValidator algorithm: + *

+ * This algorithm is described in the + * CertPathValidator section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * *

* Concurrent Access *

@@ -118,10 +131,10 @@ public class CertPathValidator { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested CertPathValidator - * algorithm. See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * algorithm. See the CertPathValidator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @return a CertPathValidator object that implements the * specified algorithm. @@ -153,10 +166,10 @@ public class CertPathValidator { * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested CertPathValidator - * algorithm. See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * algorithm. See the CertPathValidator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @param provider the name of the provider. * @@ -193,12 +206,11 @@ public class CertPathValidator { * object is returned. Note that the specified Provider object * does not have to be registered in the provider list. * - * @param algorithm the name of the requested - * CertPathValidator algorithm. - * See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard algorithm names. + * @param algorithm the name of the requested CertPathValidator + * algorithm. See the CertPathValidator section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard algorithm names. * * @param provider the provider. * diff --git a/jdk/src/share/classes/java/security/cert/CertStore.java b/jdk/src/share/classes/java/security/cert/CertStore.java index 0d8de632ba9..325b715ed77 100644 --- a/jdk/src/share/classes/java/security/cert/CertStore.java +++ b/jdk/src/share/classes/java/security/cert/CertStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,10 +58,20 @@ import sun.security.jca.GetInstance.Instance; * vast repository of untrusted certificates and CRLs. For example, an LDAP * implementation of CertStore provides access to certificates * and CRLs stored in one or more directories using the LDAP protocol and the - * schema as defined in the RFC service attribute. See Appendix A in the - * - * Java Certification Path API Programmer's Guide for more information about - * standard CertStore types. + * schema as defined in the RFC service attribute. + * + *

Every implementation of the Java platform is required to support the + * following standard CertStore type: + *

+ * This type is described in the + * CertStore section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other types are supported. + * *

* Concurrent Access *

@@ -192,10 +202,10 @@ public class CertStore { * cloned. * * @param type the name of the requested CertStore type. - * See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard types. + * See the CertStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard types. * * @param params the initialization parameters (may be null). * @@ -252,10 +262,10 @@ public class CertStore { * cloned. * * @param type the requested CertStore type. - * See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard types. + * See the CertStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard types. * * @param params the initialization parameters (may be null). * @@ -310,10 +320,10 @@ public class CertStore { * cloned. * * @param type the requested CertStore type. - * See Appendix A in the - * Java Certification Path API Programmer's Guide - * for information about standard types. + * See the CertStore section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard types. * * @param params the initialization parameters (may be null). * diff --git a/jdk/src/share/classes/java/security/cert/Certificate.java b/jdk/src/share/classes/java/security/cert/Certificate.java index be350f326bd..efe37ac7e34 100644 --- a/jdk/src/share/classes/java/security/cert/Certificate.java +++ b/jdk/src/share/classes/java/security/cert/Certificate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,9 +69,9 @@ public abstract class Certificate implements java.io.Serializable { * Creates a certificate of the specified type. * * @param type the standard name of the certificate type. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the CertificateFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard certificate types. */ protected Certificate(String type) { diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactory.java b/jdk/src/share/classes/java/security/cert/CertificateFactory.java index 6b2528b0a44..4cd81f43d81 100644 --- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java +++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,11 +91,29 @@ import sun.security.jca.GetInstance.Instance; * } * * + *

Every implementation of the Java platform is required to support the + * following standard CertificateFactory type: + *

+ * and the following standard CertPath encodings: + * + * The type and encodings are described in the + * CertificateFactory section and the + * CertPath Encodings section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other types or encodings are supported. + * * @author Hemma Prafullchandra * @author Jan Luehe * @author Sean Mullan * - * * @see Certificate * @see X509Certificate * @see CertPath @@ -146,9 +164,9 @@ public class CertificateFactory { * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the name of the requested certificate type. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the CertificateFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard certificate types. * * @return a certificate factory object for the specified type. @@ -184,9 +202,9 @@ public class CertificateFactory { * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the certificate type. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the CertificateFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard certificate types. * * @param provider the name of the provider. @@ -228,11 +246,10 @@ public class CertificateFactory { * does not have to be registered in the provider list. * * @param type the certificate type. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the CertificateFactory section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard certificate types. - * @param provider the provider. * * @return a certificate factory object for the specified type. @@ -325,10 +342,10 @@ public class CertificateFactory { /** * Returns an iteration of the CertPath encodings supported * by this certificate factory, with the default encoding first. See - * Appendix A in the - * - * Java Certification Path API Programmer's Guide for information about - * standard encoding names and their formats. + * the CertPath Encodings section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation + * for information about standard encoding names and their formats. *

* Attempts to modify the returned Iterator via its * remove method result in an @@ -364,9 +381,10 @@ public class CertificateFactory { /** * Generates a CertPath object and initializes it with * the data read from the InputStream inStream. The data - * is assumed to be in the specified encoding. See Appendix A in the - * - * Java Certification Path API Programmer's Guide + * is assumed to be in the specified encoding. See + * the CertPath Encodings section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard encoding names and their formats. * * @param inStream an InputStream containing the data diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java b/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java index a9dbae734fa..b7a3c55f8ab 100644 --- a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java +++ b/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -182,9 +182,9 @@ public abstract class CertificateFactorySpi { /** * Returns an iteration of the CertPath encodings supported * by this certificate factory, with the default encoding first. See - * Appendix A in the - * - * Java Certification Path API Programmer's Guide + * the CertPath Encodings section in the + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard encoding names. *

* Attempts to modify the returned Iterator via its diff --git a/jdk/src/share/classes/java/security/cert/package.html b/jdk/src/share/classes/java/security/cert/package.html index 55109aaf3d4..0851accc6c5 100644 --- a/jdk/src/share/classes/java/security/cert/package.html +++ b/jdk/src/share/classes/java/security/cert/package.html @@ -1,5 +1,5 @@ -@since JDK1.4 +@since 1.4