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

Diff for /src/usr.bin/ssh/Attic/kexc25519c.c between version 1.5 and 1.6

version 1.5, 2015/01/19 19:52:16 version 1.6, 2015/01/19 20:16:15
Line 31 
Line 31 
 #include <string.h>  #include <string.h>
 #include <signal.h>  #include <signal.h>
   
 #include "xmalloc.h"  #include "sshkey.h"
 #include "buffer.h"  
 #include "key.h"  
 #include "cipher.h"  #include "cipher.h"
 #include "kex.h"  #include "kex.h"
 #include "log.h"  #include "log.h"
 #include "packet.h"  #include "packet.h"
 #include "ssh2.h"  #include "ssh2.h"
   #include "sshbuf.h"
   #include "digest.h"
   #include "ssherr.h"
   
 void  static int
 kexc25519_client(Kex *kex)  input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt);
   
   int
   kexc25519_client(struct ssh *ssh)
 {  {
         Key *server_host_key;          struct kex *kex = ssh->kex;
         u_char client_key[CURVE25519_SIZE];          int r;
         u_char client_pubkey[CURVE25519_SIZE];  
         u_char *server_pubkey = NULL;  
         u_char *server_host_key_blob = NULL, *signature = NULL;  
         u_char *hash;  
         u_int slen, sbloblen, hashlen;  
         Buffer shared_secret;  
   
         kexc25519_keygen(client_key, client_pubkey);          kexc25519_keygen(kex->c25519_client_key, kex->c25519_client_pubkey);
   
         packet_start(SSH2_MSG_KEX_ECDH_INIT);  
         packet_put_string(client_pubkey, sizeof(client_pubkey));  
         packet_send();  
         debug("sending SSH2_MSG_KEX_ECDH_INIT");  
   
 #ifdef DEBUG_KEXECDH  #ifdef DEBUG_KEXECDH
         dump_digest("client private key:", client_key, sizeof(client_key));          dump_digest("client private key:", kex->c25519_client_key,
               sizeof(kex->c25519_client_key));
 #endif  #endif
           if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_ECDH_INIT)) != 0 ||
               (r = sshpkt_put_string(ssh, kex->c25519_client_pubkey,
               sizeof(kex->c25519_client_pubkey))) != 0 ||
               (r = sshpkt_send(ssh)) != 0)
                   return r;
   
         debug("expecting SSH2_MSG_KEX_ECDH_REPLY");          debug("expecting SSH2_MSG_KEX_ECDH_REPLY");
         packet_read_expect(SSH2_MSG_KEX_ECDH_REPLY);          ssh_dispatch_set(ssh, SSH2_MSG_KEX_ECDH_REPLY, &input_kex_c25519_reply);
           return 0;
   }
   
   static int
   input_kex_c25519_reply(int type, u_int32_t seq, void *ctxt)
   {
           struct ssh *ssh = ctxt;
           struct kex *kex = ssh->kex;
           struct sshkey *server_host_key = NULL;
           struct sshbuf *shared_secret = NULL;
           u_char *server_pubkey = NULL;
           u_char *server_host_key_blob = NULL, *signature = NULL;
           u_char hash[SSH_DIGEST_MAX_LENGTH];
           size_t slen, pklen, sbloblen, hashlen;
           int r;
   
           if (kex->verify_host_key == NULL) {
                   r = SSH_ERR_INVALID_ARGUMENT;
                   goto out;
           }
   
         /* hostkey */          /* hostkey */
         server_host_key_blob = packet_get_string(&sbloblen);          if ((r = sshpkt_get_string(ssh, &server_host_key_blob,
         server_host_key = key_from_blob(server_host_key_blob, sbloblen);              &sbloblen)) != 0 ||
         if (server_host_key == NULL)              (r = sshkey_from_blob(server_host_key_blob, sbloblen,
                 fatal("cannot decode server_host_key_blob");              &server_host_key)) != 0)
         if (server_host_key->type != kex->hostkey_type)                  goto out;
                 fatal("type mismatch for decoded server_host_key_blob");          if (server_host_key->type != kex->hostkey_type) {
         if (kex->verify_host_key == NULL)                  r = SSH_ERR_KEY_TYPE_MISMATCH;
                 fatal("cannot verify server_host_key");                  goto out;
         if (kex->verify_host_key(server_host_key) == -1)          }
                 fatal("server_host_key verification failed");          if (kex->verify_host_key(server_host_key, ssh) == -1) {
                   r = SSH_ERR_SIGNATURE_INVALID;
                   goto out;
           }
   
         /* Q_S, server public key */          /* Q_S, server public key */
         server_pubkey = packet_get_string(&slen);          /* signed H */
         if (slen != CURVE25519_SIZE)          if ((r = sshpkt_get_string(ssh, &server_pubkey, &pklen)) != 0 ||
                 fatal("Incorrect size for server Curve25519 pubkey: %d", slen);              (r = sshpkt_get_string(ssh, &signature, &slen)) != 0 ||
               (r = sshpkt_get_end(ssh)) != 0)
                   goto out;
           if (pklen != CURVE25519_SIZE) {
                   r = SSH_ERR_SIGNATURE_INVALID;
                   goto out;
           }
   
 #ifdef DEBUG_KEXECDH  #ifdef DEBUG_KEXECDH
         dump_digest("server public key:", server_pubkey, CURVE25519_SIZE);          dump_digest("server public key:", server_pubkey, CURVE25519_SIZE);
 #endif  #endif
   
         /* signed H */          if ((shared_secret = sshbuf_new()) == NULL) {
         signature = packet_get_string(&slen);                  r = SSH_ERR_ALLOC_FAIL;
         packet_check_eom();                  goto out;
           }
           if ((r = kexc25519_shared_key(kex->c25519_client_key, server_pubkey,
               shared_secret)) < 0)
                   goto out;
   
         buffer_init(&shared_secret);  
         kexc25519_shared_key(client_key, server_pubkey, &shared_secret);  
   
         /* calc and verify H */          /* calc and verify H */
         kex_c25519_hash(          hashlen = sizeof(hash);
           if ((r = kex_c25519_hash(
             kex->hash_alg,              kex->hash_alg,
             kex->client_version_string,              kex->client_version_string,
             kex->server_version_string,              kex->server_version_string,
             buffer_ptr(kex->my), buffer_len(kex->my),              sshbuf_ptr(kex->my), sshbuf_len(kex->my),
             buffer_ptr(kex->peer), buffer_len(kex->peer),              sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),
             server_host_key_blob, sbloblen,              server_host_key_blob, sbloblen,
             client_pubkey,              kex->c25519_client_pubkey,
             server_pubkey,              server_pubkey,
             buffer_ptr(&shared_secret), buffer_len(&shared_secret),              sshbuf_ptr(shared_secret), sshbuf_len(shared_secret),
             &hash, &hashlen              hash, &hashlen)) < 0)
         );                  goto out;
         free(server_host_key_blob);  
         free(server_pubkey);  
         if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1)  
                 fatal("key_verify failed for server_host_key");  
         key_free(server_host_key);  
         free(signature);  
   
           if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen,
               ssh->compat)) != 0)
                   goto out;
   
         /* save session id */          /* save session id */
         if (kex->session_id == NULL) {          if (kex->session_id == NULL) {
                 kex->session_id_len = hashlen;                  kex->session_id_len = hashlen;
                 kex->session_id = xmalloc(kex->session_id_len);                  kex->session_id = malloc(kex->session_id_len);
                   if (kex->session_id == NULL) {
                           r = SSH_ERR_ALLOC_FAIL;
                           goto out;
                   }
                 memcpy(kex->session_id, hash, kex->session_id_len);                  memcpy(kex->session_id, hash, kex->session_id_len);
         }          }
         kex_derive_keys(kex, hash, hashlen,  
             buffer_ptr(&shared_secret), buffer_len(&shared_secret));          if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
         buffer_free(&shared_secret);                  r = kex_send_newkeys(ssh);
         kex_finish(kex);  out:
           explicit_bzero(hash, sizeof(hash));
           explicit_bzero(kex->c25519_client_key, sizeof(kex->c25519_client_key));
           free(server_host_key_blob);
           free(server_pubkey);
           free(signature);
           sshkey_free(server_host_key);
           sshbuf_free(shared_secret);
           return r;
 }  }
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6