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