Misc. refactoring in tls

Author: peterdettman

tls/src/main/java/org/bouncycastle/jsse/provider/ProvTlsServer.java

@@ -340,12 +340,10 @@ protected boolean selectCipherSuite(int cipherSuite) throws IOException
             }
         }
 
-        boolean result = super.selectCipherSuite(cipherSuite);
-        if (result)
-        {
-            this.credentials = cipherSuiteCredentials;
-        }
-        return result;
+        this.selectedCipherSuite = cipherSuite;
+        this.credentials = cipherSuiteCredentials;
+
+        return true;
     }
 
     @Override

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

@@ -188,27 +188,27 @@ protected DTLSTransport serverHandshake(ServerHandshakeState state, DTLSRequest
 
         state.keyExchange = TlsUtils.initKeyExchangeServer(serverContext, server);
 
-        state.serverCredentials = null;
+        TlsCredentials serverCredentials = null;
 
         if (!KeyExchangeAlgorithm.isAnonymous(securityParameters.getKeyExchangeAlgorithm()))
         {
-            state.serverCredentials = TlsUtils.establishServerCredentials(server);
+            serverCredentials = TlsUtils.establishServerCredentials(server);
         }
 
         // Server certificate
         {
             Certificate serverCertificate = null;
 
             ByteArrayOutputStream endPointHash = new ByteArrayOutputStream();
-            if (state.serverCredentials == null)
+            if (serverCredentials == null)
             {
                 state.keyExchange.skipServerCredentials();
             }
             else
             {
-                state.keyExchange.processServerCredentials(state.serverCredentials);
+                state.keyExchange.processServerCredentials(serverCredentials);
 
-                serverCertificate = state.serverCredentials.getCertificate();
+                serverCertificate = serverCredentials.getCertificate();
 
                 sendCertificateMessage(serverContext, handshake, serverCertificate, endPointHash);
             }
@@ -237,7 +237,7 @@ protected DTLSTransport serverHandshake(ServerHandshakeState state, DTLSRequest
             handshake.sendMessage(HandshakeType.server_key_exchange, serverKeyExchange);
         }
 
-        if (state.serverCredentials != null)
+        if (serverCredentials != null)
         {
             state.certificateRequest = server.getCertificateRequest();
 
@@ -1026,7 +1026,6 @@ protected static class ServerHandshakeState
         Hashtable serverExtensions = null;
         boolean expectSessionTicket = false;
         TlsKeyExchange keyExchange = null;
-        TlsCredentials serverCredentials = null;
         CertificateRequest certificateRequest = null;
         TlsHeartbeat heartbeat = null;
         short heartbeatPolicy = HeartbeatMode.peer_not_allowed_to_send;

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

@@ -1593,7 +1593,7 @@ protected void send13ServerHelloCoda(ServerHello serverHello, boolean afterHello
                     this.connection_state = CS_SERVER_CERTIFICATE_REQUEST;
                 }
             }
-    
+
             TlsCredentialedSigner serverCredentials = TlsUtils.establish13ServerCredentials(tlsServer);
             if (null == serverCredentials)
             {

tls/src/main/java/org/bouncycastle/tls/crypto/impl/TlsAEADCipher.java

@@ -436,8 +436,8 @@ private void rekeyCipher(SecurityParameters securityParameters, TlsAEADCipherImp
     private void setup13Cipher(TlsAEADCipherImpl cipher, byte[] nonce, TlsSecret secret, int cryptoHashAlgorithm)
         throws IOException
     {
-        byte[] key = TlsCryptoUtils.hkdfExpandLabel(secret, cryptoHashAlgorithm, "key", TlsUtils.EMPTY_BYTES, keySize).extract();
-        byte[] iv = TlsCryptoUtils.hkdfExpandLabel(secret, cryptoHashAlgorithm, "iv", TlsUtils.EMPTY_BYTES, fixed_iv_length).extract();
+        byte[] key = hkdfExpandLabel(secret, cryptoHashAlgorithm, "key", keySize).extract();
+        byte[] iv = hkdfExpandLabel(secret, cryptoHashAlgorithm, "iv", fixed_iv_length).extract();
 
         cipher.setKey(key, 0, keySize);
         System.arraycopy(iv, 0, nonce, 0, fixed_iv_length);
@@ -458,4 +458,10 @@ private static int getNonceMode(boolean isTLSv13, int aeadType) throws IOExcepti
             throw new TlsFatalAlert(AlertDescription.internal_error);
         }
     }
+
+    private static TlsSecret hkdfExpandLabel(TlsSecret secret, int cryptoHashAlgorithm, String label, int length)
+        throws IOException
+    {
+        return TlsCryptoUtils.hkdfExpandLabel(secret, cryptoHashAlgorithm, label, TlsUtils.EMPTY_BYTES, length);
+    }
 }