archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8257788: Class fields could be local in the SunJSSE provider

Browse source 
Reviewed-by: shade
This commit is contained in:
Xue-Lei Andrew Fan 2020-12-07 16:35:01 +00:00
parent d29c78da19
commit dcf63f8578
4 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
View file

@ -323,8 +323,6 @@ final class CertStatusExtension {
final List<ResponderId> responderIds;
final List<Extension> extensions;
private final int ridListLen;
private final int extListLen;
static {
OCSPStatusRequest ocspReq = null;
@ -360,7 +358,7 @@ final class CertStatusExtension {
List<Extension> exts = new ArrayList<>();
ByteBuffer m = ByteBuffer.wrap(encoded);
this.ridListLen = Record.getInt16(m);
int ridListLen = Record.getInt16(m);
if (m.remaining() < (ridListLen + 2)) {
throw new SSLProtocolException(
"Invalid OCSP status request: insufficient data");
@ -384,7 +382,7 @@ final class CertStatusExtension {
}
byte[] extListBytes = Record.getBytes16(m);
this.extListLen = extListBytes.length;
int extListLen = extListBytes.length;
if (extListLen > 0) {
try {
DerInputStream dis = new DerInputStream(extListBytes);

3
src/java.base/share/classes/sun/security/ssl/HKDF.java
View file

@ -44,7 +44,6 @@ import java.util.Objects;
* derivation process.
*/
final class HKDF {
private final String hmacAlg;
private final Mac hmacObj;
private final int hmacLen;
@ -61,7 +60,7 @@ final class HKDF {
HKDF(String hashAlg) throws NoSuchAlgorithmException {
Objects.requireNonNull(hashAlg,
"Must provide underlying HKDF Digest algorithm.");
hmacAlg = "Hmac" + hashAlg.replace("-", "");
String hmacAlg = "Hmac" + hashAlg.replace("-", "");
hmacObj = Mac.getInstance(hmacAlg);
hmacLen = hmacObj.getMacLength();
}

6
src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
View file

@ -60,19 +60,15 @@ final class SSLSecretDerivation implements SSLKeyDerivation {
(byte)0x48, (byte)0x98, (byte)0xB9, (byte)0x5B
};
private final HandshakeContext context;
private final String hkdfAlg;
private final HashAlg hashAlg;
private final SecretKey secret;
private final byte[] transcriptHash; // handshake messages transcript hash
SSLSecretDerivation(
HandshakeContext context, SecretKey secret) {
this.context = context;
this.secret = secret;
this.hashAlg = context.negotiatedCipherSuite.hashAlg;
this.hkdfAlg =
"HKDF-Expand/Hmac" + hashAlg.name.replace("-", "");
String hkdfAlg = "HKDF-Expand/Hmac" + hashAlg.name.replace("-", "");
context.handshakeHash.update();
this.transcriptHash = context.handshakeHash.digest();
}

4
src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
View file

@ -203,14 +203,10 @@ enum SSLTrafficKeyDerivation implements SSLKeyDerivationGenerator {
@SuppressWarnings("deprecation")
static final class LegacyTrafficKeyDerivation implements SSLKeyDerivation {
private final HandshakeContext context;
private final SecretKey masterSecret;
private final TlsKeyMaterialSpec keyMaterialSpec;
LegacyTrafficKeyDerivation(
HandshakeContext context, SecretKey masterSecret) {
this.context = context;
this.masterSecret = masterSecret;
CipherSuite cipherSuite = context.negotiatedCipherSuite;
ProtocolVersion protocolVersion = context.negotiatedProtocol;