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

Diff for /src/usr.bin/ssh/kexgexc.c between version 1.2 and 1.2.8.3

version 1.2, 2003/12/08 11:00:47 version 1.2.8.3, 2006/11/08 00:44:05
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.   * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.   * Copyright (c) 2001 Markus Friedl.  All rights reserved.
Line 23 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include "includes.h"  #include <sys/types.h>
 RCSID("$OpenBSD$");  
   
   #include <stdio.h>
   #include <string.h>
   #include <signal.h>
   
 #include "xmalloc.h"  #include "xmalloc.h"
   #include "buffer.h"
 #include "key.h"  #include "key.h"
   #include "cipher.h"
 #include "kex.h"  #include "kex.h"
 #include "log.h"  #include "log.h"
 #include "packet.h"  #include "packet.h"
Line 42 
Line 48 
         BIGNUM *p = NULL, *g = NULL;          BIGNUM *p = NULL, *g = NULL;
         Key *server_host_key;          Key *server_host_key;
         u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;          u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
         u_int klen, kout, slen, sbloblen;          u_int klen, slen, sbloblen, hashlen;
           int kout;
         int min, max, nbits;          int min, max, nbits;
         DH *dh;          DH *dh;
   
Line 120 
Line 127 
         if (kex->verify_host_key(server_host_key) == -1)          if (kex->verify_host_key(server_host_key) == -1)
                 fatal("server_host_key verification failed");                  fatal("server_host_key verification failed");
   
         /* DH paramter f, server public DH key */          /* DH parameter f, server public DH key */
         if ((dh_server_pub = BN_new()) == NULL)          if ((dh_server_pub = BN_new()) == NULL)
                 fatal("dh_server_pub == NULL");                  fatal("dh_server_pub == NULL");
         packet_get_bignum2(dh_server_pub);          packet_get_bignum2(dh_server_pub);
Line 141 
Line 148 
   
         klen = DH_size(dh);          klen = DH_size(dh);
         kbuf = xmalloc(klen);          kbuf = xmalloc(klen);
         kout = DH_compute_key(kbuf, dh_server_pub, dh);          if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0)
                   fatal("DH_compute_key: failed");
 #ifdef DEBUG_KEXDH  #ifdef DEBUG_KEXDH
         dump_digest("shared secret", kbuf, kout);          dump_digest("shared secret", kbuf, kout);
 #endif  #endif
         if ((shared_secret = BN_new()) == NULL)          if ((shared_secret = BN_new()) == NULL)
                 fatal("kexgex_client: BN_new failed");                  fatal("kexgex_client: BN_new failed");
         BN_bin2bn(kbuf, kout, shared_secret);          if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
                   fatal("kexgex_client: BN_bin2bn failed");
         memset(kbuf, 0, klen);          memset(kbuf, 0, klen);
         xfree(kbuf);          xfree(kbuf);
   
Line 155 
Line 164 
                 min = max = -1;                  min = max = -1;
   
         /* calc and verify H */          /* calc and verify 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->my), buffer_len(&kex->my),              buffer_ptr(&kex->my), buffer_len(&kex->my),
Line 165 
Line 175 
             dh->p, dh->g,              dh->p, dh->g,
             dh->pub_key,              dh->pub_key,
             dh_server_pub,              dh_server_pub,
             shared_secret              shared_secret,
               &hash, &hashlen
         );          );
   
         /* have keys, free DH */          /* have keys, free DH */
         DH_free(dh);          DH_free(dh);
         xfree(server_host_key_blob);          xfree(server_host_key_blob);
         BN_clear_free(dh_server_pub);          BN_clear_free(dh_server_pub);
   
         if (key_verify(server_host_key, signature, slen, hash, 20) != 1)          if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1)
                 fatal("key_verify failed for server_host_key");                  fatal("key_verify failed for server_host_key");
         key_free(server_host_key);          key_free(server_host_key);
         xfree(signature);          xfree(signature);
   
         /* save session id */          /* save session id */
         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);
         }          }
         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.2  
changed lines
  Added in v.1.2.8.3