[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.64.2.1 and 1.64.2.2

version 1.64.2.1, 2006/02/03 03:01:56 version 1.64.2.2, 2006/10/06 03:19:32
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.   * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *   *
Line 22 
Line 23 
  * 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/param.h>
 RCSID("$OpenBSD$");  
   
   #include <signal.h>
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
   
 #include <openssl/crypto.h>  #include <openssl/crypto.h>
   
 #include "ssh2.h"  
 #include "xmalloc.h"  #include "xmalloc.h"
   #include "ssh2.h"
 #include "buffer.h"  #include "buffer.h"
 #include "bufaux.h"  
 #include "packet.h"  #include "packet.h"
 #include "compat.h"  #include "compat.h"
 #include "cipher.h"  #include "cipher.h"
 #include "kex.h"  
 #include "key.h"  #include "key.h"
   #include "kex.h"
 #include "log.h"  #include "log.h"
 #include "mac.h"  #include "mac.h"
 #include "match.h"  #include "match.h"
Line 44 
Line 48 
   
 #define KEX_COOKIE_LEN  16  #define KEX_COOKIE_LEN  16
   
   extern const EVP_MD *evp_ssh_sha256(void);
   
 /* prototype */  /* prototype */
 static void kex_kexinit_finish(Kex *);  static void kex_kexinit_finish(Kex *);
 static void kex_choose_conf(Kex *);  static void kex_choose_conf(Kex *);
Line 75 
Line 81 
         int i;          int i;
         char **proposal;          char **proposal;
   
         proposal = xmalloc(PROPOSAL_MAX * sizeof(char *));          proposal = xcalloc(PROPOSAL_MAX, sizeof(char *));
   
         buffer_init(&b);          buffer_init(&b);
         buffer_append(&b, buffer_ptr(raw), buffer_len(raw));          buffer_append(&b, buffer_ptr(raw), buffer_len(raw));
Line 210 
Line 216 
 {  {
         Kex *kex;          Kex *kex;
   
         kex = xmalloc(sizeof(*kex));          kex = xcalloc(1, sizeof(*kex));
         memset(kex, 0, sizeof(*kex));  
         buffer_init(&kex->peer);          buffer_init(&kex->peer);
         buffer_init(&kex->my);          buffer_init(&kex->my);
         kex_prop2buf(&kex->my, proposal);          kex_prop2buf(&kex->my, proposal);
Line 254 
Line 259 
         enc->key_len = cipher_keylen(enc->cipher);          enc->key_len = cipher_keylen(enc->cipher);
         enc->block_size = cipher_blocksize(enc->cipher);          enc->block_size = cipher_blocksize(enc->cipher);
 }  }
   
 static void  static void
 choose_mac(Mac *mac, char *client, char *server)  choose_mac(Mac *mac, char *client, char *server)
 {  {
Line 269 
Line 275 
         mac->key = NULL;          mac->key = NULL;
         mac->enabled = 0;          mac->enabled = 0;
 }  }
   
 static void  static void
 choose_comp(Comp *comp, char *client, char *server)  choose_comp(Comp *comp, char *client, char *server)
 {  {
Line 286 
Line 293 
         }          }
         comp->name = name;          comp->name = name;
 }  }
   
 static void  static void
 choose_kex(Kex *k, char *client, char *server)  choose_kex(Kex *k, char *client, char *server)
 {  {
Line 301 
Line 309 
         } else if (strcmp(k->name, KEX_DHGEX_SHA1) == 0) {          } else if (strcmp(k->name, KEX_DHGEX_SHA1) == 0) {
                 k->kex_type = KEX_DH_GEX_SHA1;                  k->kex_type = KEX_DH_GEX_SHA1;
                 k->evp_md = EVP_sha1();                  k->evp_md = EVP_sha1();
           } else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) {
                   k->kex_type = KEX_DH_GEX_SHA256;
                   k->evp_md = evp_ssh_sha256();
         } else          } else
                 fatal("bad kex alg %s", k->name);                  fatal("bad kex alg %s", k->name);
 }  }
Line 364 
Line 375 
   
         /* Algorithm Negotiation */          /* Algorithm Negotiation */
         for (mode = 0; mode < MODE_MAX; mode++) {          for (mode = 0; mode < MODE_MAX; mode++) {
                 newkeys = xmalloc(sizeof(*newkeys));                  newkeys = xcalloc(1, sizeof(*newkeys));
                 memset(newkeys, 0, sizeof(*newkeys));  
                 kex->newkeys[mode] = newkeys;                  kex->newkeys[mode] = newkeys;
                 ctos = (!kex->server && mode == MODE_OUT) || (kex->server && mode == MODE_IN);                  ctos = (!kex->server && mode == MODE_OUT) || (kex->server && mode == MODE_IN);
                 nenc  = ctos ? PROPOSAL_ENC_ALGS_CTOS  : PROPOSAL_ENC_ALGS_STOC;                  nenc  = ctos ? PROPOSAL_ENC_ALGS_CTOS  : PROPOSAL_ENC_ALGS_STOC;
Line 420 
Line 430 
   
         if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0)          if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0)
                 fatal("bad kex md size %d", mdsz);                  fatal("bad kex md size %d", mdsz);
         digest = xmalloc(roundup(need, mdsz));          digest = xmalloc(roundup(need, mdsz));
   
         buffer_init(&b);          buffer_init(&b);
         buffer_put_bignum2(&b, shared_secret);          buffer_put_bignum2(&b, shared_secret);
Line 473 
Line 483 
         for (mode = 0; mode < MODE_MAX; mode++) {          for (mode = 0; mode < MODE_MAX; mode++) {
                 current_keys[mode] = kex->newkeys[mode];                  current_keys[mode] = kex->newkeys[mode];
                 kex->newkeys[mode] = NULL;                  kex->newkeys[mode] = NULL;
                 ctos = (!kex->server && mode == MODE_OUT) || (kex->server && mode == MODE_IN);                  ctos = (!kex->server && mode == MODE_OUT) ||
                       (kex->server && mode == MODE_IN);
                 current_keys[mode]->enc.iv  = keys[ctos ? 0 : 1];                  current_keys[mode]->enc.iv  = keys[ctos ? 0 : 1];
                 current_keys[mode]->enc.key = keys[ctos ? 2 : 3];                  current_keys[mode]->enc.key = keys[ctos ? 2 : 3];
                 current_keys[mode]->mac.key = keys[ctos ? 4 : 5];                  current_keys[mode]->mac.key = keys[ctos ? 4 : 5];
Legend:
Removed from v.1.64.2.1  
changed lines
  Added in v.1.64.2.2