OpenJDK / amber / amber
changeset 8152:94e5966bdf22
5001004: Required Security Algorithms need to be defined
Reviewed-by: wetmore
line wrap: on
line diff
--- a/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * default modulus prime size of 1024 bits for the generation of DSA * parameters. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>AlgorithmParameterGenerator</code> algorithms and + * keysizes in parentheses: + * <ul> + * <li><tt>DiffieHellman</tt> (1024)</li> + * <li><tt>DSA</tt> (1024)</li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"> + * AlgorithmParameterGenerator section</a> 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 @@ * * @param algorithm the name of the algorithm this * parameter generator is associated with. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameterGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new AlgorithmParameterGenerator object. @@ -168,9 +182,9 @@ * * @param algorithm the name of the algorithm this * parameter generator is associated with. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameterGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the string name of the Provider. @@ -214,9 +228,9 @@ * * @param algorithm the string name of the algorithm this * parameter generator is associated with. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameterGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the Provider object.
--- a/jdk/src/share/classes/java/security/AlgorithmParameters.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/AlgorithmParameters.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * <code>getParameterSpec</code>, and a byte encoding of the parameters is * obtained via a call to <code>getEncoded</code>. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>AlgorithmParameters</code> algorithms: + * <ul> + * <li><tt>AES</tt></li> + * <li><tt>DES</tt></li> + * <li><tt>DESede</tt></li> + * <li><tt>DiffieHellman</tt></li> + * <li><tt>DSA</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameters"> + * AlgorithmParameters section</a> 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 @@ * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameters section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameters"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new parameter object. @@ -153,9 +169,9 @@ * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameters section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameters"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -200,9 +216,9 @@ * parameter encoding. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the AlgorithmParameters section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameters"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider.
--- a/jdk/src/share/classes/java/security/KeyFactory.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/KeyFactory.java Mon Jan 24 14:56:14 2011 -0500 @@ -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,9 +67,22 @@ * sig.verify(signature); * </pre> * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>KeyFactory</code> algorithms: + * <ul> + * <li><tt>DiffieHellman</tt></li> + * <li><tt>DSA</tt></li> + * <li><tt>RSA</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyFactory"> + * KeyFactory section</a> 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 * @see PrivateKey @@ -141,9 +154,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new KeyFactory object. @@ -172,9 +185,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -211,9 +224,9 @@ * does not have to be registered in the provider list. * * @param algorithm the name of the requested key algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/java/security/KeyPairGenerator.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/KeyPairGenerator.java Mon Jan 24 14:56:14 2011 -0500 @@ -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,9 +105,23 @@ * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of key pair generators. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>KeyPairGenerator</code> algorithms and keysizes in + * parentheses: + * <ul> + * <li><tt>DiffieHellman</tt> (1024)</li> + * <li><tt>DSA</tt> (1024)</li> + * <li><tt>RSA</tt> (1024, 2048)</li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * KeyPairGenerator section</a> 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 @@ * Creates a KeyPairGenerator object for the specified algorithm. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyPairGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. */ protected KeyPairGenerator(String algorithm) { @@ -133,9 +147,9 @@ /** * Returns the standard name of the algorithm for this key pair generator. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyPairGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the standard string name of the algorithm. @@ -171,9 +185,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyPairGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new KeyPairGenerator object. @@ -227,9 +241,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyPairGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the string name of the provider. @@ -266,9 +280,9 @@ * does not have to be registered in the provider list. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyPairGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/java/security/KeyStore.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/KeyStore.java Mon Jan 24 14:56:14 2011 -0500 @@ -164,9 +164,20 @@ * different passwords or other protection parameters * may also be used. * + * <p> Every implementation of the Java platform is required to support + * the following standard <code>KeyStore</code> type: + * <ul> + * <li><tt>PKCS12</tt></li> + * </ul> + * This type is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyStore"> + * KeyStore section</a> 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 * @see java.security.cert.Certificate @@ -582,9 +593,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the type of keystore. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard keystore types. * * @return a keystore object of the specified type. @@ -620,9 +631,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the type of keystore. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard keystore types. * * @param provider the name of the provider. @@ -663,9 +674,9 @@ * does not have to be registered in the provider list. * * @param type the type of keystore. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the KeyStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard keystore types. * * @param provider the provider.
--- a/jdk/src/share/classes/java/security/MessageDigest.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/MessageDigest.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ /** * 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,9 +81,22 @@ * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of message digest algorithms. * + * <p> Every implementation of the Java platform is required to support + * the following standard <code>MessageDigest</code> algorithms: + * <ul> + * <li><tt>MD5</tt></li> + * <li><tt>SHA-1</tt></li> + * <li><tt>SHA-256</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * MessageDigest section</a> 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 @@ * Creates a message digest with the specified algorithm name. * * @param algorithm the standard name of the digest algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the MessageDigest section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. */ protected MessageDigest(String algorithm) { @@ -127,9 +140,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the MessageDigest section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return a Message Digest object that implements the specified algorithm. @@ -173,9 +186,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the MessageDigest section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -222,9 +235,9 @@ * does not have to be registered in the provider list. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the MessageDigest section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider. @@ -439,9 +452,9 @@ * 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 <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the MessageDigest section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#MessageDigest"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the name of the algorithm
--- a/jdk/src/share/classes/java/security/Policy.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/Policy.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * implementation. In addition, an instance of a Policy object can be * constructed by invoking one of the <code>getInstance</code> factory methods * with a standard type. The default policy type is "JavaPolicy". - * See Appendix A in the <a href="../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> - * for a list of standard Policy types. * * <p> Once a Policy instance has been installed (either by default, or by * calling <code>setPolicy</code>), @@ -133,7 +130,7 @@ * This method first calls * <code>SecurityManager.checkPermission</code> with a * <code>SecurityPermission("getPolicy")</code> 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 @@ * <p> 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 - * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * @param type the specified Policy type. See the Policy section in the + * <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Policy"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null. @@ -393,9 +391,10 @@ * <p> 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 - * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * @param type the specified Policy type. See the Policy section in the + * <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Policy"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null. @@ -456,9 +455,10 @@ * 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 - * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * @param type the specified Policy type. See the Policy section in the + * <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Policy"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for a list of standard Policy types. * * @param params parameters for the Policy, which may be null.
--- a/jdk/src/share/classes/java/security/SecureRandom.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/SecureRandom.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * <p> Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * <p> See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * <p> See the SecureRandom section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecureRandom"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard RNG algorithm names. * * <p> The returned SecureRandom object has not been seeded. To seed the @@ -171,9 +171,9 @@ * <p> Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * <p> See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * <p> See the SecureRandom section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecureRandom"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard RNG algorithm names. * * @param seed the seed. @@ -256,9 +256,9 @@ * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the SecureRandom section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecureRandom"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard RNG algorithm names. * * @return the new SecureRandom object. @@ -299,9 +299,9 @@ * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the SecureRandom section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecureRandom"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard RNG algorithm names. * * @param provider the name of the provider. @@ -347,9 +347,9 @@ * previously called. * * @param algorithm the name of the RNG algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the SecureRandom section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecureRandom"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard RNG algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/java/security/Security.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/Security.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ /** * Gets a specified property for an algorithm. The algorithm name - * should be a standard name. See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * should be a standard name. See the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * 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 @@ * * </ul> * - * <p> See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * <p> See the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard cryptographic service names, standard * algorithm names and standard attribute names. * @@ -582,9 +583,9 @@ * constraint expressed by the specified attribute name/value pair. * </ul> * - * <p> See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * <p> See the <a href= + * "../../../technotes/guides/security/StandardNames.html"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard cryptographic service names, standard * algorithm names and standard attribute names. *
--- a/jdk/src/share/classes/java/security/Signature.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/Signature.java Mon Jan 24 14:56:14 2011 -0500 @@ -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.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 @@ * the superclass are intended for cryptographic service providers who wish to * supply their own implementations of digital signature algorithms. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>Signature</code> algorithms: + * <ul> + * <li><tt>SHA1withDSA</tt></li> + * <li><tt>SHA1withRSA</tt></li> + * <li><tt>SHA256withRSA</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Signature"> + * Signature section</a> 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 @@ * Creates a Signature object for the specified algorithm. * * @param algorithm the standard string name of the algorithm. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the Signature section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Signature"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. */ protected Signature(String algorithm) { @@ -184,9 +198,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the Signature section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Signature"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new Signature object. @@ -303,9 +317,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the Signature section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Signature"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -353,9 +367,9 @@ * does not have to be registered in the provider list. * * @param algorithm the name of the algorithm requested. - * See Appendix A in the <a href= - * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the Signature section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Signature"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/java/security/cert/CertPath.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertPath.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * may not follow these conventions. PKIX <code>CertPathValidator</code>s will * detect any departure from these conventions that cause the certification * path to be invalid and throw a <code>CertPathValidatorException</code>. + * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>CertPath</code> encodings: + * <ul> + * <li><tt>PKCS7</tt></li> + * <li><tt>PkiPath</tt></li> + * </ul> + * These encodings are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings"> + * CertPath Encodings section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other encodings are supported. * <p> * <b>Concurrent Access</b> * <p>
--- a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertPathBuilder.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * result (including the <code>CertPath</code> that was built) is returned * in an object that implements the <code>CertPathBuilderResult</code> * interface. + * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>CertPathBuilder</code> algorithm: + * <ul> + * <li><tt>PKIX</tt></li> + * </ul> + * This algorithm is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathBuilder"> + * CertPathBuilder section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * <p> * <b>Concurrent Access</b> * <p> @@ -118,10 +131,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested <code>CertPathBuilder</code> - * algorithm. See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathBuilder"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @return a <code>CertPathBuilder</code> object that implements the * specified algorithm. @@ -153,10 +166,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested <code>CertPathBuilder</code> - * algorithm. See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathBuilder"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @param provider the name of the provider. * @@ -193,10 +206,10 @@ * does not have to be registered in the provider list. * * @param algorithm the name of the requested <code>CertPathBuilder</code> - * algorithm. See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * algorithm. See the CertPathBuilder section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathBuilder"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @param provider the provider. *
--- a/jdk/src/share/classes/java/security/cert/CertPathValidator.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertPathValidator.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * and an algorithm-specific set of parameters. If successful, the result is * returned in an object that implements the * <code>CertPathValidatorResult</code> interface. + * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>CertPathValidator</code> algorithm: + * <ul> + * <li><tt>PKIX</tt></li> + * </ul> + * This algorithm is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathValidator"> + * CertPathValidator section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * <p> * <b>Concurrent Access</b> * <p> @@ -118,10 +131,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested <code>CertPathValidator</code> - * algorithm. See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * algorithm. See the CertPathValidator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathValidator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @return a <code>CertPathValidator</code> object that implements the * specified algorithm. @@ -153,10 +166,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the name of the requested <code>CertPathValidator</code> - * algorithm. See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * algorithm. See the CertPathValidator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathValidator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @param provider the name of the provider. * @@ -193,12 +206,11 @@ * 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 - * <code>CertPathValidator</code> algorithm. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard algorithm names. + * @param algorithm the name of the requested <code>CertPathValidator</code> + * algorithm. See the CertPathValidator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathValidator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard algorithm names. * * @param provider the provider. *
--- a/jdk/src/share/classes/java/security/cert/CertStore.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertStore.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * vast repository of untrusted certificates and CRLs. For example, an LDAP * implementation of <code>CertStore</code> 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 - * <a href= "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide</a> for more information about - * standard <code>CertStore</code> types. + * schema as defined in the RFC service attribute. + * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>CertStore</code> type: + * <ul> + * <li><tt>Collection</tt></li> + * </ul> + * This type is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertStore"> + * CertStore section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other types are supported. + * * <p> * <b>Concurrent Access</b> * <p> @@ -192,10 +202,10 @@ * cloned. * * @param type the name of the requested <code>CertStore</code> type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard types. + * See the CertStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard types. * * @param params the initialization parameters (may be <code>null</code>). * @@ -252,10 +262,10 @@ * cloned. * * @param type the requested <code>CertStore</code> type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard types. + * See the CertStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard types. * * @param params the initialization parameters (may be <code>null</code>). * @@ -310,10 +320,10 @@ * cloned. * * @param type the requested <code>CertStore</code> type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide </a> - * for information about standard types. + * See the CertStore section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertStore"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard types. * * @param params the initialization parameters (may be <code>null</code>). *
--- a/jdk/src/share/classes/java/security/cert/Certificate.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/Certificate.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * Creates a certificate of the specified type. * * @param type the standard name of the certificate type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the CertificateFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard certificate types. */ protected Certificate(String type) {
--- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ * } * </pre> * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>CertificateFactory</code> type: + * <ul> + * <li><tt>X.509</tt></li> + * </ul> + * and the following standard <code>CertPath</code> encodings: + * <ul> + * <li><tt>PKCS7</tt></li> + * <li><tt>PkiPath</tt></li> + * </ul> + * The type and encodings are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory"> + * CertificateFactory section</a> and the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings"> + * CertPath Encodings section</a> 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 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the name of the requested certificate type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the CertificateFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard certificate types. * * @return a certificate factory object for the specified type. @@ -184,9 +202,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param type the certificate type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the CertificateFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard certificate types. * * @param provider the name of the provider. @@ -228,11 +246,10 @@ * does not have to be registered in the provider list. * * @param type the certificate type. - * See Appendix A in the <a href= - * "../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the CertificateFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard certificate types. - * @param provider the provider. * * @return a certificate factory object for the specified type. @@ -325,10 +342,10 @@ /** * Returns an iteration of the <code>CertPath</code> encodings supported * by this certificate factory, with the default encoding first. See - * Appendix A in the - * <a href="../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide</a> for information about - * standard encoding names and their formats. + * the CertPath Encodings section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> + * for information about standard encoding names and their formats. * <p> * Attempts to modify the returned <code>Iterator</code> via its * <code>remove</code> method result in an @@ -364,9 +381,10 @@ /** * Generates a <code>CertPath</code> object and initializes it with * the data read from the <code>InputStream</code> inStream. The data - * is assumed to be in the specified encoding. See Appendix A in the - * <a href="../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide</a> + * is assumed to be in the specified encoding. See + * the CertPath Encodings section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard encoding names and their formats. * * @param inStream an <code>InputStream</code> containing the data
--- a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ /** * Returns an iteration of the <code>CertPath</code> encodings supported * by this certificate factory, with the default encoding first. See - * Appendix A in the - * <a href="../../../../technotes/guides/security/certpath/CertPathProgGuide.html#AppA"> - * Java Certification Path API Programmer's Guide</a> + * the CertPath Encodings section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard encoding names. * <p> * Attempts to modify the returned <code>Iterator</code> via its
--- a/jdk/src/share/classes/java/security/cert/package.html Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/cert/package.html Mon Jan 24 14:56:14 2011 -0500 @@ -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 @@ -35,9 +35,15 @@ <h2>Package Specification</h2> <ul> - <li><a href="../../../../technotes/guides/security/crypto/CryptoSpec.html"><b>Cryptography - Architecture</b></a> - <li>RFC 3280: Internet X.509 Public Key Infrastructure Certificate and CRL Profile + <li><a href="{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture (JCA) Reference Guide</b></a> + <li>RFC 3280: Internet X.509 Public Key Infrastructure Certificate and + Certificate Revocation List (CRL) Profile + <li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture Standard Algorithm Name + Documentation</b></a></li> </ul> <h2>Related Documentation</h2> @@ -45,11 +51,13 @@ For information about X.509 certificates and CRLs, please see: <ul> <li><a href="http://www.ietf.org/rfc/rfc3280.txt"> -http://www.ietf.org/rfc/rfc3280.txt</a> - <li><a href="../../../../technotes/guides/security/certpath/CertPathProgGuide.html"> -PKI API Programmer's Guide</a> - <li><a href="../../../../technotes/guides/security/cert3.html"> -X.509 Certificates and CRLs</a> + http://www.ietf.org/rfc/rfc3280.txt</a> + <li><a href= + "{@docRoot}/../technotes/guides/security/certpath/CertPathProgGuide.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + PKI Programmer's Guide</a> + <li><a href="{@docRoot}/../technotes/guides/security/cert3.html"> + X.509 Certificates and Certificate Revocation Lists (CRLs)</a> </ul> @since 1.2
--- a/jdk/src/share/classes/java/security/package.html Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/java/security/package.html Mon Jan 24 14:56:14 2011 -0500 @@ -2,7 +2,7 @@ <html> <head> <!-- -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 @@ -51,10 +51,17 @@ <h2>Package Specification</h2> <ul> - <li><a href="{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html"><b> - Cryptography Architecture</b></a></li> + <li><a href="{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture (JCA) Reference Guide</b></a></li> - <li>PKCS8: Private-Key Information Standard, Version 1.2, November 1993</li> + <li>PKCS #8: Private-Key Information Syntax Standard, Version 1.2, + November 1993</li> + + <li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture Standard Algorithm Name + Documentation</b></a></li> </ul> <h2>Related Documentation</h2> @@ -62,13 +69,16 @@ For further documentation, please see: <ul> <li><a href= - "{@docRoot}/../technotes/guides/security/spec/security-spec.doc.html"><b> - Security Architecture</b></a></li> + "{@docRoot}/../technotes/guides/security/spec/security-spec.doc.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + SE Platform Security Architecture</b></a></li> <li><a href= - "{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html"><b> - How to Implement a Provider for the Java Cryptography Architecture + "{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html"> + <b>How to Implement a Provider in the + Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture </b></a></li> + <li><a href= "{@docRoot}/../technotes/guides/security/PolicyFiles.html"><b> Default Policy Implementation and Policy File Syntax @@ -76,12 +86,14 @@ <li><a href= "{@docRoot}/../technotes/guides/security/permissions.html"><b> - Policy Permissions + Permissions in the + Java<FONT SIZE=-2><SUP>TM</SUP></FONT> SE Development Kit (JDK) </b></a></li> <li><a href= "{@docRoot}/../technotes/guides/security/SecurityToolsSummary.html"><b> - Security Tools Summary + Summary of Tools for + Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Platform Security </b></a></li> <li><b>keytool</b> @@ -100,6 +112,6 @@ </ul> -@since JDK1.1 +@since 1.1 </body> </html>
--- a/jdk/src/share/classes/javax/crypto/Cipher.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/Cipher.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, 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 @@ -78,7 +78,7 @@ * Cipher c = Cipher.getInstance("<i>DES/CBC/PKCS5Padding</i>"); * </pre> * - * Using modes such as <code>CFB</code> and <code>OFB<code>, block + * Using modes such as <code>CFB</code> and <code>OFB</code>, block * ciphers can encrypt data in units smaller than the cipher's actual * block size. When requesting such a mode, you may optionally specify * the number of bits to be processed at a time by appending this number @@ -89,6 +89,33 @@ * Thus, block ciphers can be turned into byte-oriented stream ciphers by * using an 8 bit mode such as CFB8 or OFB8. * + * <p> Every implementation of the Java platform is required to support + * the following standard <code>Cipher</code> transformations with the keysizes + * in parentheses: + * <ul> + * <li><tt>AES/CBC/NoPadding</tt> (128)</li> + * <li><tt>AES/CBC/PKCS5Padding</tt> (128)</li> + * <li><tt>AES/ECB/NoPadding</tt> (128)</li> + * <li><tt>AES/ECB/PKCS5Padding</tt> (128)</li> + * <li><tt>DES/CBC/NoPadding</tt> (56)</li> + * <li><tt>DES/CBC/PKCS5Padding</tt> (56)</li> + * <li><tt>DES/ECB/NoPadding</tt> (56)</li> + * <li><tt>DES/ECB/PKCS5Padding</tt> (56)</li> + * <li><tt>DESede/CBC/NoPadding</tt> (168)</li> + * <li><tt>DESede/CBC/PKCS5Padding</tt> (168)</li> + * <li><tt>DESede/ECB/NoPadding</tt> (168)</li> + * <li><tt>DESede/ECB/PKCS5Padding</tt> (168)</li> + * <li><tt>RSA/ECB/PKCS1Padding</tt> (1024, 2048)</li> + * <li><tt>RSA/ECB/OAEPWithSHA-1AndMGF1Padding</tt> (1024, 2048)</li> + * <li><tt>RSA/ECB/OAEPWithSHA-256AndMGF1Padding</tt> (1024, 2048)</li> + * </ul> + * These transformations are described in the + * <a href="{@docRoot}/../technotes/guides/security/StandardNames.html#Cipher"> + * Cipher section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other transformations are supported. + * * @author Jan Luehe * @see KeyGenerator * @see SecretKey @@ -408,10 +435,9 @@ * * @param transformation the name of the transformation, e.g., * <i>DES/CBC/PKCS5Padding</i>. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Cipher section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Cipher"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard transformation names. * * @return a cipher that implements the requested transformation. @@ -485,10 +511,9 @@ * * @param transformation the name of the transformation, * e.g., <i>DES/CBC/PKCS5Padding</i>. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Cipher section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Cipher"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard transformation names. * * @param provider the name of the provider. @@ -538,10 +563,9 @@ * * @param transformation the name of the transformation, * e.g., <i>DES/CBC/PKCS5Padding</i>. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Cipher section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Cipher"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard transformation names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/ExemptionMechanism.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/ExemptionMechanism.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -114,10 +114,10 @@ * * @param algorithm the standard name of the requested exemption * mechanism. - * See Appendix A in the + * See the ExemptionMechanism section in the * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * "{docRoot}/../technotes/guides/security/StandardNames.html#Exemption"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard exemption mechanism names. * * @return the new <code>ExemptionMechanism</code> object. @@ -153,10 +153,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * @param algorithm the standard name of the requested exemption mechanism. - * See Appendix A in the + * See the ExemptionMechanism section in the * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * "{docRoot}/../technotes/guides/security/StandardNames.html#Exemption"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard exemption mechanism names. * * @param provider the name of the provider. @@ -197,10 +197,10 @@ * does not have to be registered in the provider list. * * @param algorithm the standard name of the requested exemption mechanism. - * See Appendix A in the + * See the ExemptionMechanism section in the * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * "{docRoot}/../technotes/guides/security/StandardNames.html#Exemption"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard exemption mechanism names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/KeyAgreement.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/KeyAgreement.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, 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 @@ -54,6 +54,18 @@ * <code>false</code>, and the second time setting it to <code>true</code>. * There may be any number of parties involved in a key exchange. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>KeyAgreement</code> algorithm: + * <ul> + * <li><tt>DiffieHellman</tt></li> + * </ul> + * This algorithm is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyAgreement"> + * KeyAgreement section</a> 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 KeyGenerator @@ -135,10 +147,9 @@ * * @param algorithm the standard name of the requested key agreement * algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyAgreement section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyAgreement"> + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @return the new <code>KeyAgreement</code> object. @@ -182,10 +193,9 @@ * * @param algorithm the standard name of the requested key agreement * algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyAgreement section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyAgreement"> + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the name of the provider. @@ -227,10 +237,9 @@ * * @param algorithm the standard name of the requested key agreement * algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyAgreement section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyAgreement"> + * Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/KeyGenerator.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/KeyGenerator.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, 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 @@ -84,6 +84,23 @@ * (via a call to an <code>init</code> method), each provider must * supply (and document) a default initialization. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>KeyGenerator</code> algorithms with the keysizes in + * parentheses: + * <ul> + * <li><tt>AES</tt> (128)</li> + * <li><tt>DES</tt> (56)</li> + * <li><tt>DESede</tt> (168)</li> + * <li><tt>HmacSHA1</tt></li> + * <li><tt>HmacSHA256</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyGenerator"> + * KeyGenerator section</a> 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 SecretKey @@ -170,10 +187,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the requested key algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new <code>KeyGenerator</code> object. @@ -204,10 +220,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the requested key algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -247,10 +262,9 @@ * does not have to be registered in the provider list. * * @param algorithm the standard name of the requested key algorithm. - * See Appendix A in the - * <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the KeyGenerator section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyGenerator"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/Mac.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/Mac.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, 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 @@ -53,6 +53,20 @@ * e.g., MD5 or SHA-1, in combination with a secret shared key. HMAC is * specified in RFC 2104. * + * <p> Every implementation of the Java platform is required to support + * the following standard <code>Mac</code> algorithms: + * <ul> + * <li><tt>HmacMD5</tt></li> + * <li><tt>HmacSHA1</tt></li> + * <li><tt>HmacSHA256</tt></li> + * </ul> + * These algorithms are described in the + * <a href="{@docRoot}/../technotes/guides/security/StandardNames.html#Mac"> + * Mac section</a> 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 * * @since 1.4 @@ -134,9 +148,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the requested MAC algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Mac section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Mac"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new <code>Mac</code> object. @@ -176,9 +190,9 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param algorithm the standard name of the requested MAC algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Mac section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Mac"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -214,9 +228,9 @@ * does not have to be registered in the provider list. * * @param algorithm the standard name of the requested MAC algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the Mac section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Mac"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, 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 @@ -58,6 +58,20 @@ * <code>DESedeKeySpec</code> as a transparent representation of Triple DES * keys. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>SecretKeyFactory</code> algorithms: + * <ul> + * <li><tt>AES</tt></li> + * <li><tt>DES</tt></li> + * <li><tt>DESede</tt></li> + * </ul> + * These algorithms are described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory"> + * SecretKeyFactory section</a> 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 SecretKey @@ -125,9 +139,9 @@ * * @param algorithm the standard name of the requested secret-key * algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the SecretKeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @return the new <code>SecretKeyFactory</code> object. @@ -160,9 +174,9 @@ * * @param algorithm the standard name of the requested secret-key * algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the SecretKeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the name of the provider. @@ -204,9 +218,9 @@ * * @param algorithm the standard name of the requested secret-key * algorithm. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture Reference Guide</a> + * See the SecretKeyFactory section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SecretKeyFactory"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for information about standard algorithm names. * * @param provider the provider.
--- a/jdk/src/share/classes/javax/crypto/package.html Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/crypto/package.html Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ <!-- -Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1999, 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 @@ -44,6 +44,15 @@ Therefore application developers may take advantage of any number of provider-based implementations without having to add or rewrite code. +<h2>Package Specification</h2> + +<ul> + <li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html"><b> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture Standard Algorithm Name + Documentation</b></a></li> +</ul> + <h2>Related Documentation</h2> For further documentation, please see: @@ -52,12 +61,12 @@ <a href= "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html"> <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> - Cryptography Architecture API Specification and Reference + Cryptography Architecture (JCA) Reference Guide </b></a></li> <li> <a href= "{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html"> - <b>How to Implement a Provider for the + <b>How to Implement a Provider in the Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture </b></a></li> </ul>
--- a/jdk/src/share/classes/javax/net/ssl/SSLContext.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/net/ssl/SSLContext.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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,6 +37,18 @@ * with an optional set of key and trust managers and source of * secure random bytes. * + * <p> Every implementation of the Java platform is required to support the + * following standard <code>SSLContext</code> protocol: + * <ul> + * <li><tt>TLSv1</tt></li> + * </ul> + * This protocol is described in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext"> + * SSLContext section</a> of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. + * * @since 1.4 */ public class SSLContext { @@ -124,9 +136,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param protocol the standard name of the requested protocol. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/jsse/JSSERefGuide.html#AppA"> - * Java Secure Socket Extension Reference Guide </a> + * See the SSLContext section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> * for information about standard protocol names. * * @return the new <code>SSLContext</code> object. @@ -159,9 +172,10 @@ * the {@link Security#getProviders() Security.getProviders()} method. * * @param protocol the standard name of the requested protocol. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/jsse/JSSERefGuide.html#AppA"> - * Java Secure Socket Extension Reference Guide </a> + * See the SSLContext section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> * for information about standard protocol names. * * @param provider the name of the provider. @@ -198,9 +212,10 @@ * does not have to be registered in the provider list. * * @param protocol the standard name of the requested protocol. - * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides/security/jsse/JSSERefGuide.html#AppA"> - * Java Secure Socket Extension Reference Guide </a> + * See the SSLContext section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> * for information about standard protocol names. * * @param provider an instance of the provider.
--- a/jdk/src/share/classes/javax/net/ssl/package.html Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/net/ssl/package.html Mon Jan 24 14:56:14 2011 -0500 @@ -2,7 +2,7 @@ <html> <head> <!-- -Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1999, 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 @@ -33,14 +33,17 @@ classes, you can communicate using SSL or a related security protocol to reliably detect any errors introduced into the network byte stream and to optionally encrypt the data and/or authenticate the communicating peers. -<!-- + <h2>Package Specification</h2> -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### <ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> + <li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture Standard Algorithm Name + Documentation</b></a></li> </ul> +<!-- <h2>Related Documentation</h2> For overviews, tutorials, examples, guides, and tool documentation, please see:
--- a/jdk/src/share/classes/javax/security/auth/login/Configuration.java Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/security/auth/login/Configuration.java Mon Jan 24 14:56:14 2011 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, 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 @@ -184,9 +184,9 @@ * implementation. In addition, an instance of a Configuration object can be * constructed by invoking one of the <code>getInstance</code> factory methods * with a standard type. The default policy type is "JavaLoginConfig". - * See Appendix A in the - * <a href="../../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> + * See the Configuration section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Configuration"> + * Java Cryptography Architecture Standard Algorithm Name Documentation</a> * for a list of standard Configuration types. * * @see javax.security.auth.login.LoginContext @@ -319,10 +319,11 @@ * <p> Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * @param type the specified Configuration type. See Appendix A in the - * <a href="../../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> - * for a list of standard Configuration types. + * @param type the specified Configuration type. See the Configuration + * section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Configuration"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> for a list of standard Configuration types. * * @param params parameters for the Configuration, which may be null. * @@ -374,10 +375,11 @@ * <p> Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - * @param type the specified Configuration type. See Appendix A in the - * <a href="../../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> - * for a list of standard Configuration types. + * @param type the specified Configuration type. See the Configuration + * section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Configuration"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> for a list of standard Configuration types. * * @param params parameters for the Configuration, which may be null. * @@ -439,10 +441,11 @@ * object is returned. Note that the specified Provider object * does not have to be registered in the provider list. * - * @param type the specified Configuration type. See Appendix A in the - * <a href="../../../../../technotes/guides/security/crypto/CryptoSpec.html#AppA"> - * Java Cryptography Architecture API Specification & Reference </a> - * for a list of standard Configuration types. + * @param type the specified Configuration type. See the Configuration + * section in the <a href= + * "{@docRoot}/../technotes/guides/security/StandardNames.html#Configuration"> + * Java Cryptography Architecture Standard Algorithm Name + * Documentation</a> for a list of standard Configuration types. * * @param params parameters for the Configuration, which may be null. *
--- a/jdk/src/share/classes/javax/security/auth/login/package.html Mon Oct 18 09:05:49 2010 -0400 +++ b/jdk/src/share/classes/javax/security/auth/login/package.html Mon Jan 24 14:56:14 2011 -0500 @@ -2,7 +2,7 @@ <html> <head> <!-- -Copyright (c) 2000, 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 @@ -30,14 +30,16 @@ <body bgcolor="white"> This package provides a pluggable authentication framework. -<!-- <h2>Package Specification</h2> -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### <ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> + <li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html"> + <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT> + Cryptography Architecture Standard Algorithm Name + Documentation</b></a></li> </ul> +<!-- <h2>Related Documentation</h2> For overviews, tutorials, examples, guides, and tool documentation, please see: @@ -47,6 +49,6 @@ --> -@since JDK1.4 +@since 1.4 </body> </html>