Switch from ECB to CBC for the authentication phase and include the port along with the IP to identify a client or server