--- a/src/ch/ethz/ssh2/transport/ServerKexManager.java	Thu Jul 31 12:51:42 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ServerKexManager.java	Thu Jul 31 12:59:08 2014 -0700
@@ -45,7 +45,7 @@
     }
 
     public void handleFailure(final IOException failure) {
-        synchronized(accessLock) {
+        synchronized (accessLock) {
             connectionClosed = true;
             accessLock.notifyAll();
         }
@@ -62,25 +62,25 @@
             }
         }
 
-        if((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) {
+        if ((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) {
             throw new PacketTypeException(msg[0]);
         }
 
-        if(ignore_next_kex_packet) {
+        if (ignore_next_kex_packet) {
             ignore_next_kex_packet = false;
             return;
         }
 
-        if(msg[0] == Packets.SSH_MSG_KEXINIT) {
-            if((kxs != null) && (kxs.state != 0)) {
+        if (msg[0] == Packets.SSH_MSG_KEXINIT) {
+            if ((kxs != null) && (kxs.state != 0)) {
                 throw new PacketTypeException(msg[0]);
             }
 
-            if(kxs == null) {
+            if (kxs == null) {
                 /*
                  * Ah, OK, peer wants to do KEX. Let's be nice and play
-				 * together.
-				 */
+                 * together.
+                 */
                 kxs = new KexState();
                 kxs.local_dsa_key = nextKEXdsakey;
                 kxs.local_rsa_key = nextKEXrsakey;
@@ -93,19 +93,18 @@
 
             kip = new PacketKexInit(msg);
             kxs.remoteKEX = kip;
-
             kxs.np = mergeKexParameters(kxs.remoteKEX.getKexParameters(), kxs.localKEX.getKexParameters());
 
-            if(kxs.remoteKEX.isFirst_kex_packet_follows() && (kxs.np.guessOK == false)) {
+            if (kxs.remoteKEX.isFirst_kex_packet_follows() && (kxs.np.guessOK == false)) {
                 // Guess was wrong, we need to ignore the next kex packet.
                 ignore_next_kex_packet = true;
             }
 
             if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1")  ||
-                kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
-                kxs.np.kex_algo.equals("ecdh-sha2-nistp256")          ||
-                kxs.np.kex_algo.equals("ecdh-sha2-nistp384")          ||
-                kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
+                    kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
+                    kxs.np.kex_algo.equals("ecdh-sha2-nistp256")          ||
+                    kxs.np.kex_algo.equals("ecdh-sha2-nistp384")          ||
+                    kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
                 kxs.dhx = GenericDhExchange.getInstance(kxs.np.kex_algo);
                 kxs.dhx.init(kxs.np.kex_algo);
                 kxs.state = 1;
@@ -115,8 +114,8 @@
             throw new IllegalStateException("Unkown KEX method!");
         }
 
-        if(msg[0] == Packets.SSH_MSG_NEWKEYS) {
-            if(km == null) {
+        if (msg[0] == Packets.SSH_MSG_NEWKEYS) {
+            if (km == null) {
                 throw new IOException("Peer sent SSH_MSG_NEWKEYS, but I have no key material ready!");
             }
 
@@ -125,26 +124,22 @@
 
             try {
                 cbc = BlockCipherFactory.createCipher(kxs.np.enc_algo_client_to_server, false,
-                        km.enc_key_client_to_server, km.initial_iv_client_to_server);
+                                                      km.enc_key_client_to_server, km.initial_iv_client_to_server);
 
                 try {
                     mac = new MAC(kxs.np.mac_algo_client_to_server, km.integrity_key_client_to_server);
                 }
-                catch(DigestException e) {
+                catch (DigestException e) {
                     throw new IOException(e);
                 }
-
             }
-            catch(IllegalArgumentException e) {
+            catch (IllegalArgumentException e) {
                 throw new IOException(e);
             }
 
             tm.changeRecvCipher(cbc, mac);
-
             ConnectionInfo sci = new ConnectionInfo();
-
             kexCount++;
-
             sci.keyExchangeAlgorithm = kxs.np.kex_algo;
             sci.keyExchangeCounter = kexCount;
             sci.clientToServerCryptoAlgorithm = kxs.np.enc_algo_client_to_server;
@@ -154,7 +149,7 @@
             sci.serverHostKeyAlgorithm = kxs.np.server_host_key_algo;
             sci.serverHostKey = kxs.remote_hostkey;
 
-            synchronized(accessLock) {
+            synchronized (accessLock) {
                 lastConnInfo = sci;
                 accessLock.notifyAll();
             }
@@ -163,44 +158,41 @@
             return;
         }
 
-        if((kxs == null) || (kxs.state == 0)) {
+        if ((kxs == null) || (kxs.state == 0)) {
             throw new IOException("Unexpected Kex submessage!");
         }
 
         if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1")  ||
-            kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
-            kxs.np.kex_algo.equals("ecdh-sha2-nistp256")          ||
-            kxs.np.kex_algo.equals("ecdh-sha2-nistp384")          ||
-            kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
-            if(kxs.state == 1) {
+                kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") ||
+                kxs.np.kex_algo.equals("ecdh-sha2-nistp256")          ||
+                kxs.np.kex_algo.equals("ecdh-sha2-nistp384")          ||
+                kxs.np.kex_algo.equals("ecdh-sha2-nistp521")) {
+            if (kxs.state == 1) {
                 PacketKexDHInit dhi = new PacketKexDHInit(msg);
-
                 kxs.dhx.setE(dhi.getE());
-
                 byte[] hostKey = null;
 
                 if (kxs.np.server_host_key_algo.startsWith("ecdsa-sha2-")) {
                     hostKey = ECDSASHA2Verify.encodeSSHECDSAPublicKey((ECPublicKey)kxs.local_ec_key.getPublic());
                 }
 
-                if(kxs.np.server_host_key_algo.equals("ssh-rsa")) {
+                if (kxs.np.server_host_key_algo.equals("ssh-rsa")) {
                     hostKey = RSASHA1Verify.encodeSSHRSAPublicKey((RSAPublicKey)kxs.local_rsa_key.getPublic());
                 }
 
-                if(kxs.np.server_host_key_algo.equals("ssh-dss")) {
+                if (kxs.np.server_host_key_algo.equals("ssh-dss")) {
                     hostKey = DSASHA1Verify.encodeSSHDSAPublicKey((DSAPublicKey)kxs.local_dsa_key.getPublic());
                 }
 
                 try {
                     kxs.H = kxs.dhx.calculateH(csh.getClientString(), csh.getServerString(),
-                            kxs.remoteKEX.getPayload(), kxs.localKEX.getPayload(), hostKey);
+                                               kxs.remoteKEX.getPayload(), kxs.localKEX.getPayload(), hostKey);
                 }
-                catch(IllegalArgumentException e) {
+                catch (IllegalArgumentException e) {
                     throw new IOException("KEX error.", e);
                 }
 
                 kxs.K = kxs.dhx.getK();
-
                 byte[] signature = null;
 
                 if (kxs.np.server_host_key_algo.startsWith("ecdsa-sha2-")) {
@@ -221,11 +213,10 @@
 
                 PacketKexDHReply dhr = new PacketKexDHReply(hostKey, new BigInteger(kxs.dhx.getF()), signature);
                 tm.sendKexMessage(dhr.getPayload());
-
                 finishKex(false);
                 kxs.state = -1;
 
-                if(authenticationStarted == false) {
+                if (authenticationStarted == false) {
                     authenticationStarted = true;
                     state.am = new ServerAuthenticationManager(state);
                 }
@@ -233,6 +224,7 @@
                 return;
             }
         }
+
         throw new IllegalStateException(String.format("Unknown KEX method %s", kxs.np.kex_algo));
     }
 }