Refactor TlsClientProtocol

Author: peterdettman

tls/src/main/java/org/bouncycastle/tls/TlsClientProtocol.java

@@ -902,15 +902,15 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
             }
         }
 
-        final int selected_group = TlsExtensionsUtils.getKeyShareHelloRetryRequest(extensions);
+        final int selectedGroup = TlsExtensionsUtils.getKeyShareHelloRetryRequest(extensions);
 
         /*
          * TODO[tls:psk_ke]
          *
          * RFC 8446 4.2.8. Servers [..] MUST NOT send a KeyShareEntry when using the "psk_ke"
          * PskKeyExchangeMode.
          */
-        if (selected_group < 0)
+        if (selectedGroup < 0)
         {
             throw new TlsFatalAlert(AlertDescription.missing_extension,
                 "missing extension response: " + ExtensionType.getText(ExtensionType.key_share));
@@ -925,7 +925,7 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
          * MUST abort the handshake with an "illegal_parameter" alert.
          */
         if (!TlsUtils.isValidKeyShareSelection(server_version, securityParameters.getClientSupportedGroups(),
-            clientAgreements, selected_group))
+            clientAgreements, selectedGroup))
         {
             throw new TlsFatalAlert(AlertDescription.illegal_parameter, "invalid key_share selected");
         }
@@ -946,7 +946,7 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
 
         this.clientAgreements = null;
         this.retryCookie = cookie;
-        this.retryGroup = selected_group;
+        this.retryGroup = selectedGroup;
     }
 
     protected void process13ServerHello(ServerHello serverHello, boolean afterHelloRetryRequest)
@@ -1051,8 +1051,8 @@ protected void process13ServerHello(ServerHello serverHello, boolean afterHelloR
 
         TlsSecret sharedSecret = null;
         {
-            KeyShareEntry keyShareEntry = TlsExtensionsUtils.getKeyShareServerHello(extensions);
-            if (null == keyShareEntry)
+            KeyShareEntry serverShare = TlsExtensionsUtils.getKeyShareServerHello(extensions);
+            if (null == serverShare)
             {
                 if (afterHelloRetryRequest
                     || null == pskEarlySecret
@@ -1069,14 +1069,15 @@ protected void process13ServerHello(ServerHello serverHello, boolean afterHelloR
                     throw new TlsFatalAlert(AlertDescription.illegal_parameter);
                 }
 
-                int namedGroup = keyShareEntry.getNamedGroup();
+                int namedGroup = serverShare.getNamedGroup();
+
                 TlsAgreement agreement = (TlsAgreement)clientAgreements.get(Integers.valueOf(namedGroup));
                 if (null == agreement)
                 {
                     throw new TlsFatalAlert(AlertDescription.illegal_parameter);
                 }
 
-                agreement.receivePeerValue(keyShareEntry.getKeyExchange());
+                agreement.receivePeerValue(serverShare.getKeyExchange());
                 sharedSecret = agreement.calculateSecret();
             }
         }