ssh *ssh)
+ 	free(hkalgs);
  
  	if ((r = kex_exchange_identification(ssh, -1,
 -	    options.version_addendum)) != 0)
@@ -22,6 +22,6 @@
 +		BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Banner exchange");
  		sshpkt_fatal(ssh, r, "banner exchange");
 +	}
+ 	mm_sshkey_setcompat(ssh); /* tell monitor */
  
- 	ssh_packet_set_nonblocking(ssh);
- 
+ 	if ((ssh->compat & SSH_BUG_NOREKEY))