diff --git a/jdk/src/java.base/share/classes/java/lang/SecurityManager.java b/jdk/src/java.base/share/classes/java/lang/SecurityManager.java index ef893b73ec9..7ab62aba500 100644 --- a/jdk/src/java.base/share/classes/java/lang/SecurityManager.java +++ b/jdk/src/java.base/share/classes/java/lang/SecurityManager.java @@ -194,18 +194,15 @@ import sun.security.util.SecurityConstants; * of system administrators who might need to perform multiple * tasks that require all (or numerous) permissions. *

- * See - * Permissions in the JDK for permission-related information. + * See {@extLink security_guide_permissions + * Permissions in the Java Development Kit (JDK)} + * for permission-related information. * This document includes, for example, a table listing the various SecurityManager * check methods and the permission(s) the default * implementation of each such method requires. * It also contains a table of all the version 1.2 methods * that require permissions, and for each such method tells * which permission it requires. - *

- * For more information about SecurityManager changes made in - * the JDK and advice regarding porting of 1.1-style security managers, - * see the security documentation. * * @author Arthur van Hoff * @author Roland Schemers diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java index c67fc37eadb..cc9ad853bf9 100644 --- a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java +++ b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java @@ -64,8 +64,7 @@ import java.util.Objects; * AlgorithmParameterGenerator (via a call to an {@code init} method), * each provider must supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the AlgorithmParameterGenerator defaults * used by JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java index ece70f65f35..e4c0567f05f 100644 --- a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java +++ b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java @@ -40,8 +40,7 @@ import java.security.spec.AlgorithmParameterSpec; * AlgorithmParameterGenerator (via a call to an {@code engineInit} * method), each provider must supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the AlgorithmParameterGenerator defaults * used by JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/java/security/Key.java b/jdk/src/java.base/share/classes/java/security/Key.java index dab747eb403..ff5611e91e5 100644 --- a/jdk/src/java.base/share/classes/java/security/Key.java +++ b/jdk/src/java.base/share/classes/java/security/Key.java @@ -114,10 +114,10 @@ public interface Key extends java.io.Serializable { /** * Returns the standard algorithm name for this key. For * example, "DSA" would indicate that this key is a DSA key. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference - * for information about standard algorithm names. + * See the + * Java Security Standard Algorithm Names document + * for more information. * * @return the name of the algorithm associated with this key. */ diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java index fba444ebe56..cd9a0a51263 100644 --- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java +++ b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java @@ -96,8 +96,7 @@ import sun.security.util.Debug; * (via a call to an {@code initialize} method), each provider must * supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the KeyPairGenerator defaults used by * JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java b/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java index 85f02b2ad86..bbd7b271ad4 100644 --- a/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java +++ b/jdk/src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java @@ -40,8 +40,7 @@ import java.security.spec.AlgorithmParameterSpec; * (via a call to an {@code initialize} method), each provider must * supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the KeyPairGenerator defaults used by * JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/java/security/Provider.java b/jdk/src/java.base/share/classes/java/security/Provider.java index f17cfca932a..cf20bfec3ac 100644 --- a/jdk/src/java.base/share/classes/java/security/Provider.java +++ b/jdk/src/java.base/share/classes/java/security/Provider.java @@ -94,9 +94,9 @@ import java.util.function.Function; * The JDK implementation supports static registration of the security * providers via the {@code conf/security/java.security} file in the Java * installation directory. These providers are automatically installed by - * the JDK runtime, see The Provider Class - * in the "Java Cryptography Architecture API Specification & Reference" + * the JDK runtime, see {@extLink security_guide_jca_provider + * The Provider Class} + * in the Java Cryptography Architecture (JCA) Reference Guide * for information about how a particular type of provider, the cryptographic * service provider, works and is installed. * @@ -1310,8 +1310,8 @@ public abstract class Provider extends Properties { * it is replaced by the new service. * This method also places information about this service * in the provider's Hashtable values in the format described in the - * - * Java Cryptography Architecture API Specification & Reference . + * {@extLink security_guide_jca + * Java Cryptography Architecture (JCA) Reference Guide}. * *

Also, if there is a security manager, its * {@code checkSecurityAccess} method is called with the string @@ -1593,8 +1593,8 @@ public abstract class Provider extends Properties { * suitable services and instantiates them. The valid arguments to those * methods depend on the type of service. For the service types defined * within Java SE, see the - * - * Java Cryptography Architecture API Specification & Reference + * {@extLink security_guide_jca + * Java Cryptography Architecture (JCA) Reference Guide} * for the valid values. * Note that components outside of Java SE can define additional types of * services and their behavior. @@ -1769,9 +1769,8 @@ public abstract class Provider extends Properties { * instantiation in a different way. * For details and the values of constructorParameter that are * valid for the various types of services see the - * - * Java Cryptography Architecture API Specification & - * Reference. + * {@extLink security_guide_jca + * Java Cryptography Architecture (JCA) Reference Guide}. * * @param constructorParameter the value to pass to the constructor, * or null if this type of service does not use a constructorParameter. @@ -1878,9 +1877,8 @@ public abstract class Provider extends Properties { * *

For details and the values of parameter that are valid for the * various types of services see the top of this class and the - * - * Java Cryptography Architecture API Specification & - * Reference. + * {@extLink security_guide_jca + * Java Cryptography Architecture (JCA) Reference Guide}. * Security providers can override it to implement their own test. * * @param parameter the parameter to test diff --git a/jdk/src/java.base/share/classes/java/security/Security.java b/jdk/src/java.base/share/classes/java/security/Security.java index 2431f1e1745..f68821aa53e 100644 --- a/jdk/src/java.base/share/classes/java/security/Security.java +++ b/jdk/src/java.base/share/classes/java/security/Security.java @@ -1041,8 +1041,8 @@ public final class Security { * an empty Set if there is no provider that supports the * specified service or if serviceName is null. For a complete list * of Java cryptographic services, please see the - * Java - * Cryptography Architecture API Specification & Reference. + * {@extLink security_guide_jca + * Java Cryptography Architecture (JCA) Reference Guide}. * Note: the returned set is immutable. * * @param serviceName the name of the Java cryptographic diff --git a/jdk/src/java.base/share/classes/java/security/cert/CRL.java b/jdk/src/java.base/share/classes/java/security/cert/CRL.java index f8083c72338..e149c30106e 100644 --- a/jdk/src/java.base/share/classes/java/security/cert/CRL.java +++ b/jdk/src/java.base/share/classes/java/security/cert/CRL.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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,9 +52,9 @@ public abstract class CRL { * Creates a CRL of the specified type. * * @param type the standard name of the CRL type. - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the + * Java Security Standard Algorithm Names document * for information about standard CRL types. */ protected CRL(String type) { diff --git a/jdk/src/java.base/share/classes/java/security/cert/package-info.java b/jdk/src/java.base/share/classes/java/security/cert/package-info.java index 50b0f2c9672..0a5f0b7b532 100644 --- a/jdk/src/java.base/share/classes/java/security/cert/package-info.java +++ b/jdk/src/java.base/share/classes/java/security/cert/package-info.java @@ -32,15 +32,14 @@ *

Package Specification

* * * @@ -50,12 +49,7 @@ * * * @since 1.2 diff --git a/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java b/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java index 426c56ec075..1fe4c3ddb90 100644 --- a/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java +++ b/jdk/src/java.base/share/classes/java/security/interfaces/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -42,11 +42,10 @@ * {@code Key} classes for hardware devices, please refer * to these cryptographic provider developer guides: * * *

Package Specification

@@ -61,12 +60,8 @@ * * For further documentation, please see: * * * @since 1.1 diff --git a/jdk/src/java.base/share/classes/java/security/package-info.java b/jdk/src/java.base/share/classes/java/security/package-info.java index edb91899da8..5b6b02bad5d 100644 --- a/jdk/src/java.base/share/classes/java/security/package-info.java +++ b/jdk/src/java.base/share/classes/java/security/package-info.java @@ -46,63 +46,36 @@ *

Package Specification

* * * *

Related Documentation

* * For further documentation, please see: * * diff --git a/jdk/src/java.base/share/classes/java/security/spec/package-info.java b/jdk/src/java.base/share/classes/java/security/spec/package-info.java index cb393088e5b..c8a3a62e638 100644 --- a/jdk/src/java.base/share/classes/java/security/spec/package-info.java +++ b/jdk/src/java.base/share/classes/java/security/spec/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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,18 +54,10 @@ * For documentation that includes information about algorithm parameter * and key specifications, please see: * * * @since 1.2 diff --git a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java index 4068483470c..4982a87bbe1 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java +++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java @@ -2616,11 +2616,9 @@ public class Cipher { * according to the installed JCE jurisdiction policy files. If * JCE unlimited strength jurisdiction policy files are installed, * Integer.MAX_VALUE will be returned. - * For more information on default key size in JCE jurisdiction - * policy files, please see Appendix E in the - * - * Java Cryptography Architecture Reference Guide. + * For more information on the default key sizes and the JCE jurisdiction + * policy files, please see the Cryptographic defaults and limitations in + * the {@extLink security_guide_jdk_providers JDK Providers Documentation}. * * @param transformation the cipher transformation. * @return the maximum key length in bits or Integer.MAX_VALUE. diff --git a/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java index 959ed982a55..59b4a07f349 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java +++ b/jdk/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2017, 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 @@ -116,10 +116,9 @@ public class EncryptedPrivateKeyInfo { * e.g. EncryptedPrivateKeyInfo(AlgorithmParameters, byte[]), * should be used. * - * @param algName encryption algorithm name. See Appendix A in the - * - * Java Cryptography Architecture Reference Guide + * @param algName encryption algorithm name. See the + * + * Java Security Standard Algorithm Names document * for information about standard Cipher algorithm names. * @param encryptedData encrypted data. The contents of * encrypedData are copied to protect against subsequent @@ -199,10 +198,8 @@ public class EncryptedPrivateKeyInfo { * Returns the encryption algorithm. *

Note: Standard name is returned instead of the specified one * in the constructor when such mapping is available. - * See Appendix A in the - * - * Java Cryptography Architecture Reference Guide + * See the + * Java Security Standard Algorithm Names document * for information about standard Cipher algorithm names. * * @return the encryption algorithm name. diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java index b9b621478c3..b0d4de7775c 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java +++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java @@ -84,8 +84,7 @@ import sun.security.util.Debug; * (via a call to an {@code init} method), each provider must * supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the KeyGenerator defaults used by * JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java index 57d86254281..ea084d5807a 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java +++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java @@ -39,8 +39,7 @@ import java.security.spec.*; * (via a call to an {@code init} method), each provider must * supply (and document) a default initialization. * See the Keysize Restriction sections of the - * - * JDK Providers + * {@extLink security_guide_jdk_providers JDK Providers} * document for information on the KeyGenerator defaults used by * JDK providers. * However, note that defaults may vary across different providers. diff --git a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java index 9f59e8ffed6..a7c1d62de20 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java +++ b/jdk/src/java.base/share/classes/javax/crypto/interfaces/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -39,10 +39,8 @@ * developer guide: * *

* *

Package Specification

@@ -57,10 +55,8 @@ * For further documentation, please see: * * * @since 1.4 diff --git a/jdk/src/java.base/share/classes/javax/crypto/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/package-info.java index 184676fa470..1f600560842 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/package-info.java +++ b/jdk/src/java.base/share/classes/javax/crypto/package-info.java @@ -43,7 +43,7 @@ * * * @@ -52,15 +52,11 @@ * For further documentation, please see: * * * @since 1.4 diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java b/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java index 767c0d2a6f3..a0aaafdc7ef 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java +++ b/jdk/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -81,9 +81,8 @@ public class SecretKeySpec implements KeySpec, SecretKey { * the array are copied to protect against subsequent modification. * @param algorithm the name of the secret-key algorithm to be associated * with the given key material. - * See Appendix A in the - * Java Cryptography Architecture Reference Guide + * See the + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * @exception IllegalArgumentException if algorithm * is null or key is null or empty. @@ -126,9 +125,8 @@ public class SecretKeySpec implements KeySpec, SecretKey { * @param len the length of the key material. * @param algorithm the name of the secret-key algorithm to be associated * with the given key material. - * See Appendix A in the - * Java Cryptography Architecture Reference Guide + * See the + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * @exception IllegalArgumentException if algorithm * is null or key is null, empty, or too short, diff --git a/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java index a9b4589321e..db0cc0259c8 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java +++ b/jdk/src/java.base/share/classes/javax/crypto/spec/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -57,16 +57,11 @@ * * * * @since 1.4 diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java b/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java index 1e23a429b4d..d8da54ebc46 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2017, 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,9 +44,9 @@ public abstract class ExtendedSSLSession implements SSLSession { *

* The signature algorithm name must be a standard Java Security * name (such as "SHA1withRSA", "SHA256withECDSA", and so on). - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the + * Java Security Standard Algorithm Names document * for information about standard algorithm names. *

* Note: the local supported signature algorithms should conform to @@ -72,9 +72,9 @@ public abstract class ExtendedSSLSession implements SSLSession { *

* The signature algorithm name must be a standard Java Security * name (such as "SHA1withRSA", "SHA256withECDSA", and so on). - * See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * See the + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @return An array of supported signature algorithms, in descending diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java index 443e704dde3..b34a59b15ba 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -127,8 +127,8 @@ public class KeyManagerFactory { * * @param algorithm the standard name of the requested algorithm. * See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @return the new {@code KeyManagerFactory} object @@ -165,8 +165,8 @@ public class KeyManagerFactory { * @param algorithm the standard name of the requested algorithm. * See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @param provider the name of the provider. @@ -209,8 +209,8 @@ public class KeyManagerFactory { * * @param algorithm the standard name of the requested algorithm. * See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @param provider an instance of the provider. diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java index 0172929926c..19b05f9de8a 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLParameters.java @@ -294,9 +294,10 @@ public class SSLParameters { * SSL/TLS/DTLS handshaking. This is to prevent man-in-the-middle attacks. * * @param algorithm The standard string name of the endpoint - * identification algorithm (or null). See Appendix A in the - * Java Cryptography Architecture API Specification & Reference + * identification algorithm (or null). + * See the + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @see X509ExtendedTrustManager diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java index cfd144bd917..81f2707d4aa 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java @@ -141,8 +141,8 @@ public class TrustManagerFactory { * * @param algorithm the standard name of the requested trust management * algorithm. See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @return the new {@code TrustManagerFactory} object @@ -179,8 +179,8 @@ public class TrustManagerFactory { * * @param algorithm the standard name of the requested trust management * algorithm. See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @param provider the name of the provider. @@ -223,8 +223,8 @@ public class TrustManagerFactory { * * @param algorithm the standard name of the requested trust management * algorithm. See the - * Java Secure Socket Extension Reference Guide + * "{@docRoot}/../specs/security/standard-names.html"> + * Java Security Standard Algorithm Names document * for information about standard algorithm names. * * @param provider an instance of the provider. diff --git a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java index 8e03a365c3a..edfce9f13dc 100644 --- a/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java +++ b/jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, 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 @@ -100,9 +100,9 @@ public final class KerberosPrincipal *

If the input name does not contain a realm, the default realm * is used. The default realm can be specified either in a Kerberos * configuration file or via the java.security.krb5.realm - * system property. For more information, see - * - * Kerberos Requirements. Additionally, if a security manager is + * system property. For more information, see the + * {@extLink security_guide_jgss_tutorial Kerberos Requirements}. + * Additionally, if a security manager is * installed, a {@link ServicePermission} must be granted and the service * principal of the permission must minimally be inside the * {@code KerberosPrincipal}'s realm. For example, if the result of @@ -140,9 +140,9 @@ public final class KerberosPrincipal *

If the input name does not contain a realm, the default realm * is used. The default realm can be specified either in a Kerberos * configuration file or via the java.security.krb5.realm - * system property. For more information, see - * - * Kerberos Requirements. Additionally, if a security manager is + * system property. For more information, see the + * {@extLink security_guide_jgss_tutorial Kerberos Requirements}. + * Additionally, if a security manager is * installed, a {@link ServicePermission} must be granted and the service * principal of the permission must minimally be inside the * {@code KerberosPrincipal}'s realm. For example, if the result of diff --git a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html index 20366a286eb..4c2d4cd006a 100644 --- a/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html +++ b/jdk/src/java.security.jgss/share/classes/org/ietf/jgss/package.html @@ -100,7 +100,8 @@ questions.

Related Documentation

For an online tutorial on using Java GSS-API, please see -Introduction to JAAS and Java GSS-API. +{@extLink security_guide_jgss_tutorial +Introduction to JAAS and Java GSS-API}.