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

Diff for /src/usr.bin/ssh/kexgex.c between version 1.31 and 1.32

version 1.31, 2019/01/21 10:03:37 version 1.32, 2019/01/23 00:30:41
Line 42 
Line 42 
     int hash_alg,      int hash_alg,
     const struct sshbuf *client_version,      const struct sshbuf *client_version,
     const struct sshbuf *server_version,      const struct sshbuf *server_version,
     const u_char *ckexinit, size_t ckexinitlen,      const struct sshbuf *client_kexinit,
     const u_char *skexinit, size_t skexinitlen,      const struct sshbuf *server_kexinit,
     const u_char *serverhostkeyblob, size_t sbloblen,      const struct sshbuf *server_host_key_blob,
     int min, int wantbits, int max,      int min, int wantbits, int max,
     const BIGNUM *prime,      const BIGNUM *prime,
     const BIGNUM *gen,      const BIGNUM *gen,
Line 63 
Line 63 
         if ((r = sshbuf_put_stringb(b, client_version)) < 0 ||          if ((r = sshbuf_put_stringb(b, client_version)) < 0 ||
             (r = sshbuf_put_stringb(b, server_version)) < 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, sshbuf_len(client_kexinit) + 1)) != 0 ||
             (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||              (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
             (r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 ||              (r = sshbuf_putb(b, client_kexinit)) != 0 ||
             (r = sshbuf_put_u32(b, skexinitlen+1)) != 0 ||              (r = sshbuf_put_u32(b, sshbuf_len(server_kexinit) + 1)) != 0 ||
             (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||              (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
             (r = sshbuf_put(b, skexinit, skexinitlen)) != 0 ||              (r = sshbuf_putb(b, server_kexinit)) != 0 ||
             (r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 ||              (r = sshbuf_put_stringb(b, server_host_key_blob)) != 0 ||
             (min != -1 && (r = sshbuf_put_u32(b, min)) != 0) ||              (min != -1 && (r = sshbuf_put_u32(b, min)) != 0) ||
             (r = sshbuf_put_u32(b, wantbits)) != 0 ||              (r = sshbuf_put_u32(b, wantbits)) != 0 ||
             (max != -1 && (r = sshbuf_put_u32(b, max)) != 0) ||              (max != -1 && (r = sshbuf_put_u32(b, max)) != 0) ||

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32