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

8291509: Minor cleanup could be done in sun.security

Browse source 
Reviewed-by: weijun
This commit is contained in:
Mark Powers 2022-09-15 19:59:53 +00:00 • committed by Weijun Wang
parent 6beeb8471c
commit 4cec141a90
298 changed files with 2650 additions and 3262 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -354,20 +354,21 @@ final class ECDHServerKeyExchange {
public String toString() {
if (useExplicitSigAlgorithm) {
MessageFormat messageFormat = new MessageFormat(
"\"ECDH ServerKeyExchange\": '{'\n" +
" \"parameters\": '{'\n" +
" \"named group\": \"{0}\"\n" +
" \"ecdh public\": '{'\n" +
"{1}\n" +
" '}',\n" +
" '}',\n" +
" \"digital signature\": '{'\n" +
" \"signature algorithm\": \"{2}\"\n" +
" \"signature\": '{'\n" +
"{3}\n" +
" '}',\n" +
" '}'\n" +
"'}'",
"""
"ECDH ServerKeyExchange": '{'
"parameters": '{'
"named group": "{0}"
"ecdh public": '{'
{1}
'}',
'}',
"digital signature": '{'
"signature algorithm": "{2}"
"signature": '{'
{3}
'}',
'}'
'}'""",
Locale.ENGLISH);
HexDumpEncoder hexEncoder = new HexDumpEncoder();
@ -382,17 +383,18 @@ final class ECDHServerKeyExchange {
return messageFormat.format(messageFields);
} else if (paramsSignature != null) {
MessageFormat messageFormat = new MessageFormat(
"\"ECDH ServerKeyExchange\": '{'\n" +
" \"parameters\": '{'\n" +
" \"named group\": \"{0}\"\n" +
" \"ecdh public\": '{'\n" +
"{1}\n" +
" '}',\n" +
" '}',\n" +
" \"signature\": '{'\n" +
"{2}\n" +
" '}'\n" +
"'}'",
"""
"ECDH ServerKeyExchange": '{'
"parameters": '{'
"named group": "{0}"
"ecdh public": '{'
{1}
'}',
'}',
"signature": '{'
{2}
'}'
'}'""",
Locale.ENGLISH);
HexDumpEncoder hexEncoder = new HexDumpEncoder();
@ -407,14 +409,15 @@ final class ECDHServerKeyExchange {
return messageFormat.format(messageFields);
} else { // anonymous
MessageFormat messageFormat = new MessageFormat(
"\"ECDH ServerKeyExchange\": '{'\n" +
" \"parameters\": '{'\n" +
" \"named group\": \"{0}\"\n" +
" \"ecdh public\": '{'\n" +
"{1}\n" +
" '}',\n" +
" '}'\n" +
"'}'",
"""
"ECDH ServerKeyExchange": '{'
"parameters": '{'
"named group": "{0}"
"ecdh public": '{'
{1}
'}',
'}'
'}'""",
Locale.ENGLISH);
HexDumpEncoder hexEncoder = new HexDumpEncoder();
@ -446,12 +449,10 @@ final class ECDHServerKeyExchange {
"neither an RSA or a EC key : " + keyAlgorithm);
}
if (signer != null) {
if (key instanceof PublicKey) {
signer.initVerify((PublicKey)(key));
} else {
signer.initSign((PrivateKey)key);
}
if (key instanceof PublicKey) {
signer.initVerify((PublicKey)(key));
} else {
signer.initSign((PrivateKey)key);
}
return signer;