diff --git a/src/java.base/share/classes/javax/net/ssl/SSLEngine.java b/src/java.base/share/classes/javax/net/ssl/SSLEngine.java index b3007b2a9a1..f60ab53f34e 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLEngine.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -920,9 +920,9 @@ public abstract class SSLEngine { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() @@ -946,9 +946,9 @@ public abstract class SSLEngine { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getSupportedCipherSuites() @@ -968,10 +968,10 @@ public abstract class SSLEngine { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

* See {@link #getEnabledCipherSuites()} for more information * on why a specific cipher suite may never be used on a engine. diff --git a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java index ae1889198bf..83b83c84270 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -111,9 +111,9 @@ public class SSLParameters { * {@code setCipherSuites(cipherSuites);}. Note that the * standard list of cipher suite names may be found in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list. * * @param cipherSuites the array of ciphersuites (or null) */ @@ -131,9 +131,9 @@ public class SSLParameters { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list. * * @param cipherSuites the array of ciphersuites (or null) * @param protocols the array of protocols (or null) @@ -154,9 +154,9 @@ public class SSLParameters { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @return a copy of the array of ciphersuites or null if none * have been set. @@ -171,10 +171,10 @@ public class SSLParameters { * @param cipherSuites the array of ciphersuites (or null). Note that the * standard list of cipher suite names may be found in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. */ public void setCipherSuites(String[] cipherSuites) { this.cipherSuites = clone(cipherSuites); diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java index 00a8bed19f0..20d7e7af676 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -197,9 +197,9 @@ public abstract class SSLServerSocket extends ServerSocket { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suites enabled * @see #getSupportedCipherSuites() @@ -223,10 +223,10 @@ public abstract class SSLServerSocket extends ServerSocket { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

* SSLSockets returned from accept() * inherit this setting. @@ -253,9 +253,9 @@ public abstract class SSLServerSocket extends ServerSocket { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java index e66bd11239d..68c09c02a6f 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -87,9 +87,9 @@ public abstract class SSLServerSocketFactory extends ServerSocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @see #getSupportedCipherSuites() * @return array of the cipher suites enabled by default @@ -108,9 +108,9 @@ public abstract class SSLServerSocketFactory extends ServerSocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getDefaultCipherSuites() diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java index 84e5be716fe..b2c912c3b65 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -327,9 +327,9 @@ public abstract class SSLSocket extends Socket * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() @@ -353,9 +353,9 @@ public abstract class SSLSocket extends Socket * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getSupportedCipherSuites() @@ -375,10 +375,10 @@ public abstract class SSLSocket extends Socket * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

* See {@link #getEnabledCipherSuites()} for more information * on why a specific ciphersuite may never be used on a connection. diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java index 6db6d740750..dd10f422f3e 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -113,9 +113,9 @@ public abstract class SSLSocketFactory extends SocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @see #getSupportedCipherSuites() * @return array of the cipher suites enabled by default @@ -132,9 +132,9 @@ public abstract class SSLSocketFactory extends SocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @see #getDefaultCipherSuites() * @return an array of cipher suite names