Blame pr1834-rh1022017.patch
|
 |
347e967 |
diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
|
|
|
347e967 |
--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
|
|
|
347e967 |
+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
|
|
|
0fb9d78 |
@@ -168,20 +168,10 @@
|
|
|
0fb9d78 |
"contains no supported elliptic curves");
|
|
|
edf0421 |
}
|
|
|
edf0421 |
} else { // default curves
|
|
|
edf0421 |
- int[] ids;
|
|
|
edf0421 |
- if (requireFips) {
|
|
|
edf0421 |
- ids = new int[] {
|
|
|
edf0421 |
- // only NIST curves in FIPS mode
|
|
|
edf0421 |
- 23, 24, 25, 9, 10, 11, 12, 13, 14,
|
|
|
edf0421 |
- };
|
|
|
edf0421 |
- } else {
|
|
|
edf0421 |
- ids = new int[] {
|
|
|
edf0421 |
- // NIST curves first
|
|
|
edf0421 |
- 23, 24, 25, 9, 10, 11, 12, 13, 14,
|
|
|
edf0421 |
- // non-NIST curves
|
|
|
edf0421 |
- 22,
|
|
|
edf0421 |
- };
|
|
|
edf0421 |
- }
|
|
|
edf0421 |
+ int[] ids = new int[] {
|
|
|
edf0421 |
+ // NSS currently only supports these three NIST curves
|
|
|
edf0421 |
+ 23, 24, 25
|
|
|
edf0421 |
+ };
|
|
|
418a52c |
|
|
|
edf0421 |
idList = new ArrayList<>(ids.length);
|
|
|
edf0421 |
for (int curveId : ids) {
|