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

Diff for /src/usr.bin/ssh/kexecdh.c between version 1.6 and 1.7

version 1.6, 2015/01/19 20:16:15 version 1.7, 2018/12/27 03:25:25
Line 46 
Line 46 
 kex_ecdh_hash(  kex_ecdh_hash(
     int hash_alg,      int hash_alg,
     const EC_GROUP *ec_group,      const EC_GROUP *ec_group,
     const char *client_version_string,      const struct sshbuf *client_version,
     const char *server_version_string,      const struct sshbuf *server_version,
     const u_char *ckexinit, size_t ckexinitlen,      const u_char *ckexinit, size_t ckexinitlen,
     const u_char *skexinit, size_t skexinitlen,      const u_char *skexinit, size_t skexinitlen,
     const u_char *serverhostkeyblob, size_t sbloblen,      const u_char *serverhostkeyblob, size_t sbloblen,
Line 63 
Line 63 
                 return SSH_ERR_INVALID_ARGUMENT;                  return SSH_ERR_INVALID_ARGUMENT;
         if ((b = sshbuf_new()) == NULL)          if ((b = sshbuf_new()) == NULL)
                 return SSH_ERR_ALLOC_FAIL;                  return SSH_ERR_ALLOC_FAIL;
         if ((r = sshbuf_put_cstring(b, client_version_string)) != 0 ||          if ((r = sshbuf_put_stringb(b, client_version)) < 0 ||
             (r = sshbuf_put_cstring(b, server_version_string)) != 0 ||              (r = sshbuf_put_stringb(b, server_version)) < 0 ||
             /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */              /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
             (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 ||              (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 ||
             (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||              (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7