2017-01-24 12:38:19 +00:00
|
|
|
diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
|
|
|
|
--- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
|
|
|
|
+++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
|
2017-04-21 07:56:16 +00:00
|
|
|
@@ -168,20 +168,10 @@
|
|
|
|
"contains no supported elliptic curves");
|
2017-01-24 12:38:19 +00:00
|
|
|
}
|
|
|
|
} else { // default curves
|
|
|
|
- int[] ids;
|
|
|
|
- if (requireFips) {
|
|
|
|
- ids = new int[] {
|
|
|
|
- // only NIST curves in FIPS mode
|
|
|
|
- 23, 24, 25, 9, 10, 11, 12, 13, 14,
|
|
|
|
- };
|
|
|
|
- } else {
|
|
|
|
- ids = new int[] {
|
|
|
|
- // NIST curves first
|
|
|
|
- 23, 24, 25, 9, 10, 11, 12, 13, 14,
|
|
|
|
- // non-NIST curves
|
|
|
|
- 22,
|
|
|
|
- };
|
|
|
|
- }
|
|
|
|
+ int[] ids = new int[] {
|
|
|
|
+ // NSS currently only supports these three NIST curves
|
|
|
|
+ 23, 24, 25
|
|
|
|
+ };
|
2016-06-08 17:11:04 +00:00
|
|
|
|
2017-01-24 12:38:19 +00:00
|
|
|
idList = new ArrayList<>(ids.length);
|
|
|
|
for (int curveId : ids) {
|