Skip to content

Commit f991891

Browse files
committedJan 31, 2022
8280949: Correct the references for the Java Security Standard Algorithm Names specification
Reviewed-by: mullan
1 parent 319b774 commit f991891

File tree

6 files changed

+61
-61
lines changed

6 files changed

+61
-61
lines changed
 

‎src/java.base/share/classes/javax/net/ssl/SSLEngine.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -920,9 +920,9 @@ public abstract SSLEngineResult unwrap(ByteBuffer src,
920920
* The returned array includes cipher suites from the list of standard
921921
* cipher suite names in the <a href=
922922
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
923-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
924-
* Architecture Standard Algorithm Name Documentation, and may also
925-
* include other cipher suites that the provider supports.
923+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
924+
* Algorithm Names Specification, and may also include other cipher
925+
* suites that the provider supports.
926926
*
927927
* @return an array of cipher suite names
928928
* @see #getEnabledCipherSuites()
@@ -946,9 +946,9 @@ public abstract SSLEngineResult unwrap(ByteBuffer src,
946946
* The returned array includes cipher suites from the list of standard
947947
* cipher suite names in the <a href=
948948
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
949-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
950-
* Architecture Standard Algorithm Name Documentation, and may also
951-
* include other cipher suites that the provider supports.
949+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
950+
* Algorithm Names Specification, and may also include other cipher
951+
* suites that the provider supports.
952952
*
953953
* @return an array of cipher suite names
954954
* @see #getSupportedCipherSuites()
@@ -968,10 +968,10 @@ public abstract SSLEngineResult unwrap(ByteBuffer src,
968968
* Note that the standard list of cipher suite names may be found in the
969969
* <a href=
970970
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
971-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
972-
* Architecture Standard Algorithm Name Documentation. Providers
973-
* may support cipher suite names not found in this list or might not
974-
* use the recommended name for a certain cipher suite.
971+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
972+
* Algorithm Names Specification. Providers may support cipher suite
973+
* names not found in this list or might not use the recommended name
974+
* for a certain cipher suite.
975975
* <P>
976976
* See {@link #getEnabledCipherSuites()} for more information
977977
* on why a specific cipher suite may never be used on a engine.

‎src/java.base/share/classes/javax/net/ssl/SSLParameters.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -111,9 +111,9 @@ public SSLParameters() {
111111
* {@code setCipherSuites(cipherSuites);}. Note that the
112112
* standard list of cipher suite names may be found in the <a href=
113113
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
114-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
115-
* Architecture Standard Algorithm Name Documentation. Providers
116-
* may support cipher suite names not found in this list.
114+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
115+
* Algorithm Names Specification. Providers may support cipher suite
116+
* names not found in this list.
117117
*
118118
* @param cipherSuites the array of ciphersuites (or null)
119119
*/
@@ -131,9 +131,9 @@ public SSLParameters(String[] cipherSuites) {
131131
* Note that the standard list of cipher suite names may be found in the
132132
* <a href=
133133
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
134-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
135-
* Architecture Standard Algorithm Name Documentation. Providers
136-
* may support cipher suite names not found in this list.
134+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
135+
* Algorithm Names Specification. Providers may support cipher suite
136+
* names not found in this list.
137137
*
138138
* @param cipherSuites the array of ciphersuites (or null)
139139
* @param protocols the array of protocols (or null)
@@ -154,9 +154,9 @@ private static String[] clone(String[] s) {
154154
* The returned array includes cipher suites from the list of standard
155155
* cipher suite names in the <a href=
156156
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
157-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
158-
* Architecture Standard Algorithm Name Documentation, and may also
159-
* include other cipher suites that the provider supports.
157+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
158+
* Algorithm Names Specification, and may also include other cipher suites
159+
* that the provider supports.
160160
*
161161
* @return a copy of the array of ciphersuites or null if none
162162
* have been set.
@@ -171,10 +171,10 @@ public String[] getCipherSuites() {
171171
* @param cipherSuites the array of ciphersuites (or null). Note that the
172172
* standard list of cipher suite names may be found in the <a href=
173173
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
174-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
175-
* Architecture Standard Algorithm Name Documentation. Providers
176-
* may support cipher suite names not found in this list or might not
177-
* use the recommended name for a certain cipher suite.
174+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
175+
* Algorithm Names Specification. Providers may support cipher suite
176+
* names not found in this list or might not use the recommended name
177+
* for a certain cipher suite.
178178
*/
179179
public void setCipherSuites(String[] cipherSuites) {
180180
this.cipherSuites = clone(cipherSuites);

‎src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -197,9 +197,9 @@ protected SSLServerSocket(int port, int backlog, InetAddress address)
197197
* The returned array includes cipher suites from the list of standard
198198
* cipher suite names in the <a href=
199199
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
200-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
201-
* Architecture Standard Algorithm Name Documentation, and may also
202-
* include other cipher suites that the provider supports.
200+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
201+
* Algorithm Names Specification, and may also include other cipher
202+
* suites that the provider supports.
203203
*
204204
* @return an array of cipher suites enabled
205205
* @see #getSupportedCipherSuites()
@@ -223,10 +223,10 @@ protected SSLServerSocket(int port, int backlog, InetAddress address)
223223
* Note that the standard list of cipher suite names may be found in the
224224
* <a href=
225225
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
226-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
227-
* Architecture Standard Algorithm Name Documentation. Providers
228-
* may support cipher suite names not found in this list or might not
229-
* use the recommended name for a certain cipher suite.
226+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
227+
* Algorithm Names Specification. Providers may support cipher suite
228+
* names not found in this list or might not use the recommended name
229+
* for a certain cipher suite.
230230
* <P>
231231
* <code>SSLSocket</code>s returned from <code>accept()</code>
232232
* inherit this setting.
@@ -253,9 +253,9 @@ protected SSLServerSocket(int port, int backlog, InetAddress address)
253253
* The returned array includes cipher suites from the list of standard
254254
* cipher suite names in the <a href=
255255
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
256-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
257-
* Architecture Standard Algorithm Name Documentation, and may also
258-
* include other cipher suites that the provider supports.
256+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
257+
* Algorithm Names Specification, and may also include other cipher
258+
* suites that the provider supports.
259259
*
260260
* @return an array of cipher suite names
261261
* @see #getEnabledCipherSuites()

‎src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -87,9 +87,9 @@ public static ServerSocketFactory getDefault() {
8787
* The returned array includes cipher suites from the list of standard
8888
* cipher suite names in the <a href=
8989
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
90-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
91-
* Architecture Standard Algorithm Name Documentation, and may also
92-
* include other cipher suites that the provider supports.
90+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
91+
* Algorithm Names Specification, and may also include other cipher
92+
* suites that the provider supports.
9393
*
9494
* @see #getSupportedCipherSuites()
9595
* @return array of the cipher suites enabled by default
@@ -108,9 +108,9 @@ public static ServerSocketFactory getDefault() {
108108
* The returned array includes cipher suites from the list of standard
109109
* cipher suite names in the <a href=
110110
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
111-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
112-
* Architecture Standard Algorithm Name Documentation, and may also
113-
* include other cipher suites that the provider supports.
111+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
112+
* Algorithm Names Specification, and may also include other cipher
113+
* suites that the provider supports.
114114
*
115115
* @return an array of cipher suite names
116116
* @see #getDefaultCipherSuites()

‎src/java.base/share/classes/javax/net/ssl/SSLSocket.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -327,9 +327,9 @@ protected SSLSocket(InetAddress address, int port,
327327
* The returned array includes cipher suites from the list of standard
328328
* cipher suite names in the <a href=
329329
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
330-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
331-
* Architecture Standard Algorithm Name Documentation, and may also
332-
* include other cipher suites that the provider supports.
330+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
331+
* Algorithm Names Specification, and may also include other cipher
332+
* suites that the provider supports.
333333
*
334334
* @return an array of cipher suite names
335335
* @see #getEnabledCipherSuites()
@@ -353,9 +353,9 @@ protected SSLSocket(InetAddress address, int port,
353353
* The returned array includes cipher suites from the list of standard
354354
* cipher suite names in the <a href=
355355
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
356-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
357-
* Architecture Standard Algorithm Name Documentation, and may also
358-
* include other cipher suites that the provider supports.
356+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
357+
* Algorithm Names Specification, and may also include other cipher
358+
* suites that the provider supports.
359359
*
360360
* @return an array of cipher suite names
361361
* @see #getSupportedCipherSuites()
@@ -375,10 +375,10 @@ protected SSLSocket(InetAddress address, int port,
375375
* Note that the standard list of cipher suite names may be found in the
376376
* <a href=
377377
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
378-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
379-
* Architecture Standard Algorithm Name Documentation. Providers
380-
* may support cipher suite names not found in this list or might not
381-
* use the recommended name for a certain cipher suite.
378+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
379+
* Algorithm Names Specification. Providers may support cipher suite
380+
* names not found in this list or might not use the recommended name
381+
* for a certain cipher suite.
382382
* <P>
383383
* See {@link #getEnabledCipherSuites()} for more information
384384
* on why a specific ciphersuite may never be used on a connection.

‎src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -113,9 +113,9 @@ public String run() {
113113
* The returned array includes cipher suites from the list of standard
114114
* cipher suite names in the <a href=
115115
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
116-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
117-
* Architecture Standard Algorithm Name Documentation, and may also
118-
* include other cipher suites that the provider supports.
116+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
117+
* Algorithm Names Specification, and may also include other cipher suites
118+
* that the provider supports.
119119
*
120120
* @see #getSupportedCipherSuites()
121121
* @return array of the cipher suites enabled by default
@@ -132,9 +132,9 @@ public String run() {
132132
* The returned array includes cipher suites from the list of standard
133133
* cipher suite names in the <a href=
134134
* "{@docRoot}/../specs/security/standard-names.html#jsse-cipher-suite-names">
135-
* JSSE Cipher Suite Names</a> section of the Java Cryptography
136-
* Architecture Standard Algorithm Name Documentation, and may also
137-
* include other cipher suites that the provider supports.
135+
* JSSE Cipher Suite Names</a> section of the Java Security Standard
136+
* Algorithm Names Specification, and may also include other cipher suites
137+
* that the provider supports.
138138
*
139139
* @see #getDefaultCipherSuites()
140140
* @return an array of cipher suite names

0 commit comments

Comments
 (0)
Please sign in to comment.