[BACK]Return to kex.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/kex.c between version 1.117.2.1 and 1.118

version 1.117.2.1, 2016/10/10 19:37:33 version 1.118, 2016/05/02 10:26:04
Line 77 
Line 77 
 static const struct kexalg kexalgs[] = {  static const struct kexalg kexalgs[] = {
 #ifdef WITH_OPENSSL  #ifdef WITH_OPENSSL
         { KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },          { KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
         { KEX_DH14, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },          { KEX_DH14_SHA1, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
           { KEX_DH14_SHA256, KEX_DH_GRP14_SHA256, 0, SSH_DIGEST_SHA256 },
           { KEX_DH16_SHA512, KEX_DH_GRP16_SHA512, 0, SSH_DIGEST_SHA512 },
           { KEX_DH18_SHA512, KEX_DH_GRP18_SHA512, 0, SSH_DIGEST_SHA512 },
         { KEX_DHGEX_SHA1, KEX_DH_GEX_SHA1, 0, SSH_DIGEST_SHA1 },          { KEX_DHGEX_SHA1, KEX_DH_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
         { KEX_DHGEX_SHA256, KEX_DH_GEX_SHA256, 0, SSH_DIGEST_SHA256 },          { KEX_DHGEX_SHA256, KEX_DH_GEX_SHA256, 0, SSH_DIGEST_SHA256 },
         { KEX_ECDH_SHA2_NISTP256, KEX_ECDH_SHA2,          { KEX_ECDH_SHA2_NISTP256, KEX_ECDH_SHA2,
Line 449 
Line 452 
         if (kex == NULL)          if (kex == NULL)
                 return SSH_ERR_INVALID_ARGUMENT;                  return SSH_ERR_INVALID_ARGUMENT;
   
         ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);  
         ptr = sshpkt_ptr(ssh, &dlen);          ptr = sshpkt_ptr(ssh, &dlen);
         if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)          if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
                 return r;                  return r;
Legend:
Removed from v.1.117.2.1  
changed lines
  Added in v.1.118