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

Diff for /src/usr.bin/ssh/kexgexs.c between version 1.1 and 1.1.16.1

version 1.1, 2003/02/16 17:09:57 version 1.1.16.1, 2006/02/03 03:01:56
Line 43 
Line 43 
         Key *server_host_key;          Key *server_host_key;
         DH *dh;          DH *dh;
         u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;          u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
         u_int sbloblen, klen, kout, slen;          u_int sbloblen, klen, kout, slen, hashlen;
         int min = -1, max = -1, nbits = -1, type;          int min = -1, max = -1, nbits = -1, type;
   
         if (kex->load_host_key == NULL)          if (kex->load_host_key == NULL)
Line 137 
Line 137 
         if (type == SSH2_MSG_KEX_DH_GEX_REQUEST_OLD)          if (type == SSH2_MSG_KEX_DH_GEX_REQUEST_OLD)
                 min = max = -1;                  min = max = -1;
   
         /* calc H */                    /* XXX depends on 'kex' */          /* calc H */
         hash = kexgex_hash(          kexgex_hash(
               kex->evp_md,
             kex->client_version_string,              kex->client_version_string,
             kex->server_version_string,              kex->server_version_string,
             buffer_ptr(&kex->peer), buffer_len(&kex->peer),              buffer_ptr(&kex->peer), buffer_len(&kex->peer),
Line 148 
Line 149 
             dh->p, dh->g,              dh->p, dh->g,
             dh_client_pub,              dh_client_pub,
             dh->pub_key,              dh->pub_key,
             shared_secret              shared_secret,
               &hash, &hashlen
         );          );
         BN_clear_free(dh_client_pub);          BN_clear_free(dh_client_pub);
   
         /* save session id := H */          /* save session id := H */
         /* XXX hashlen depends on KEX */  
         if (kex->session_id == NULL) {          if (kex->session_id == NULL) {
                 kex->session_id_len = 20;                  kex->session_id_len = hashlen;
                 kex->session_id = xmalloc(kex->session_id_len);                  kex->session_id = xmalloc(kex->session_id_len);
                 memcpy(kex->session_id, hash, kex->session_id_len);                  memcpy(kex->session_id, hash, kex->session_id_len);
         }          }
   
         /* sign H */          /* sign H */
         /* XXX hashlen depends on KEX */          PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, hashlen));
         PRIVSEP(key_sign(server_host_key, &signature, &slen, hash, 20));  
   
         /* destroy_sensitive_data(); */          /* destroy_sensitive_data(); */
   
Line 179 
Line 179 
         /* have keys, free DH */          /* have keys, free DH */
         DH_free(dh);          DH_free(dh);
   
         kex_derive_keys(kex, hash, shared_secret);          kex_derive_keys(kex, hash, hashlen, shared_secret);
         BN_clear_free(shared_secret);          BN_clear_free(shared_secret);
   
         kex_finish(kex);          kex_finish(kex);
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.1.16.1