From 50714b0fb9fd4391385eda3af89582dd3fb5a5f1 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Mon, 2 Dec 2019 10:42:27 -0800 Subject: [PATCH] 8235183: Remove the "HACK CODE" in comment Reviewed-by: jnimeh --- .../share/classes/sun/security/ssl/NamedGroup.java | 8 ++++---- .../classes/sun/security/ssl/SSLEngineInputRecord.java | 2 +- .../share/classes/sun/security/ssl/SignatureScheme.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java index 0e7a5347371..43ca7818353 100644 --- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java +++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java @@ -254,10 +254,10 @@ private NamedGroup(int id, String name, AlgorithmParameters algParams = null; boolean mediator = (keAlgParamSpec != null); - // HACK CODE - // // An EC provider, for example the SunEC provider, may support // AlgorithmParameters but not KeyPairGenerator or KeyAgreement. + // + // Note: Please be careful if removing this block! if (mediator && (namedGroupSpec == NamedGroupSpec.NAMED_GROUP_ECDHE)) { mediator = JsseJce.isEcAvailable(); } @@ -277,10 +277,10 @@ private NamedGroup(int id, String name, "No AlgorithmParameters for " + name, exp); } } else { - // HACK CODE - // // Please remove the following code if the XDH/X25519/X448 // AlgorithmParameters algorithms are supported in JDK. + // + // Note: Please be careful if removing this block! algParams = null; try { KeyAgreement.getInstance(name); diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java index e91e50fe107..d12968ba528 100644 --- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java +++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java @@ -381,7 +381,7 @@ private Plaintext[] handleUnknownRecord(ByteBuffer packet) "Requested to negotiate unsupported SSLv2!"); } - // hack code, the exception is caught in SSLEngineImpl + // Note that the exception is caught in SSLEngineImpl // so that SSLv2 error message can be delivered properly. throw new UnsupportedOperationException( // SSLv2Hello "Unsupported SSL v2.0 ClientHello"); diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java index 7b4b204a019..e7b57747e0b 100644 --- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java +++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java @@ -274,10 +274,10 @@ private SignatureScheme(int id, String name, Arrays.asList(handshakeSupportedProtocols); boolean mediator = true; - // HACK CODE - // // An EC provider, for example the SunEC provider, may support // AlgorithmParameters but not KeyPairGenerator or Signature. + // + // Note: Please be careful if removing this block! if ("EC".equals(keyAlgorithm)) { mediator = JsseJce.isEcAvailable(); }