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

Diff for /src/usr.bin/ssh/Attic/kexc25519s.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 28 
Line 28 
 #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 "digest.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 "ssherr.h"
   
 void  static int input_kex_c25519_init(int, u_int32_t, void *);
 kexc25519_server(Kex *kex)  
   int
   kexc25519_server(struct ssh *ssh)
 {  {
         Key *server_host_private, *server_host_public;          debug("expecting SSH2_MSG_KEX_ECDH_INIT");
           ssh_dispatch_set(ssh, SSH2_MSG_KEX_ECDH_INIT, &input_kex_c25519_init);
           return 0;
   }
   
   static int
   input_kex_c25519_init(int type, u_int32_t seq, void *ctxt)
   {
           struct ssh *ssh = ctxt;
           struct kex *kex = ssh->kex;
           struct sshkey *server_host_private, *server_host_public;
           struct sshbuf *shared_secret = NULL;
         u_char *server_host_key_blob = NULL, *signature = NULL;          u_char *server_host_key_blob = NULL, *signature = NULL;
         u_char server_key[CURVE25519_SIZE];          u_char server_key[CURVE25519_SIZE];
         u_char *client_pubkey = NULL;          u_char *client_pubkey = NULL;
         u_char server_pubkey[CURVE25519_SIZE];          u_char server_pubkey[CURVE25519_SIZE];
         u_char *hash;          u_char hash[SSH_DIGEST_MAX_LENGTH];
         u_int slen, sbloblen, hashlen;          size_t slen, pklen, sbloblen, hashlen;
         Buffer shared_secret;          int r;
   
         /* generate private key */          /* generate private key */
         kexc25519_keygen(server_key, server_pubkey);          kexc25519_keygen(server_key, server_pubkey);
 #ifdef DEBUG_KEXECDH  #ifdef DEBUG_KEXECDH
         dump_digest("server private key:", server_key, sizeof(server_key));          dump_digest("server private key:", server_key, sizeof(server_key));
 #endif  #endif
   
         if (kex->load_host_public_key == NULL ||          if (kex->load_host_public_key == NULL ||
             kex->load_host_private_key == NULL)              kex->load_host_private_key == NULL) {
                 fatal("Cannot load hostkey");                  r = SSH_ERR_INVALID_ARGUMENT;
         server_host_public = kex->load_host_public_key(kex->hostkey_type);                  goto out;
         if (server_host_public == NULL)          }
                 fatal("Unsupported hostkey type %d", kex->hostkey_type);          if ((server_host_public = kex->load_host_public_key(kex->hostkey_type,
         server_host_private = kex->load_host_private_key(kex->hostkey_type);              ssh)) == NULL ||
               (server_host_private = kex->load_host_private_key(kex->hostkey_type,
               ssh)) == NULL) {
                   r = SSH_ERR_NO_HOSTKEY_LOADED;
                   goto out;
           }
   
         debug("expecting SSH2_MSG_KEX_ECDH_INIT");          if ((r = sshpkt_get_string(ssh, &client_pubkey, &pklen)) != 0 ||
         packet_read_expect(SSH2_MSG_KEX_ECDH_INIT);              (r = sshpkt_get_end(ssh)) != 0)
         client_pubkey = packet_get_string(&slen);                  goto out;
         if (slen != CURVE25519_SIZE)          if (pklen != CURVE25519_SIZE) {
                 fatal("Incorrect size for server Curve25519 pubkey: %d", slen);                  r = SSH_ERR_SIGNATURE_INVALID;
         packet_check_eom();                  goto out;
           }
 #ifdef DEBUG_KEXECDH  #ifdef DEBUG_KEXECDH
         dump_digest("client public key:", client_pubkey, CURVE25519_SIZE);          dump_digest("client public key:", client_pubkey, CURVE25519_SIZE);
 #endif  #endif
   
         buffer_init(&shared_secret);          if ((shared_secret = sshbuf_new()) == NULL) {
         kexc25519_shared_key(server_key, client_pubkey, &shared_secret);                  r = SSH_ERR_ALLOC_FAIL;
                   goto out;
           }
           if ((r = kexc25519_shared_key(server_key, client_pubkey,
               shared_secret)) < 0)
                   goto out;
   
         /* calc H */          /* calc H */
         key_to_blob(server_host_public, &server_host_key_blob, &sbloblen);          if ((r = sshkey_to_blob(server_host_public, &server_host_key_blob,
         kex_c25519_hash(              &sbloblen)) != 0)
                   goto out;
           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->peer), buffer_len(kex->peer),              sshbuf_ptr(kex->peer), sshbuf_len(kex->peer),
             buffer_ptr(kex->my), buffer_len(kex->my),              sshbuf_ptr(kex->my), sshbuf_len(kex->my),
             server_host_key_blob, sbloblen,              server_host_key_blob, sbloblen,
             client_pubkey,              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;
   
         /* save session id := H */          /* save session id := H */
         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);
         }          }
   
         /* sign H */          /* sign H */
         kex->sign(server_host_private, server_host_public, &signature, &slen,          if ((r = kex->sign(server_host_private, server_host_public,
             hash, hashlen);              &signature, &slen, hash, hashlen, ssh->compat)) < 0)
                   goto out;
   
         /* destroy_sensitive_data(); */  
   
         /* send server hostkey, ECDH pubkey 'Q_S' and signed H */          /* send server hostkey, ECDH pubkey 'Q_S' and signed H */
         packet_start(SSH2_MSG_KEX_ECDH_REPLY);          if ((r = sshpkt_start(ssh, SSH2_MSG_KEX_ECDH_REPLY)) != 0 ||
         packet_put_string(server_host_key_blob, sbloblen);              (r = sshpkt_put_string(ssh, server_host_key_blob, sbloblen)) != 0 ||
         packet_put_string(server_pubkey, sizeof(server_pubkey));              (r = sshpkt_put_string(ssh, server_pubkey, sizeof(server_pubkey))) != 0 ||
         packet_put_string(signature, slen);              (r = sshpkt_put_string(ssh, signature, slen)) != 0 ||
         packet_send();              (r = sshpkt_send(ssh)) != 0)
                   goto out;
   
         free(signature);          if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
                   r = kex_send_newkeys(ssh);
   out:
           explicit_bzero(hash, sizeof(hash));
           explicit_bzero(server_key, sizeof(server_key));
         free(server_host_key_blob);          free(server_host_key_blob);
         /* have keys, free server key */          free(signature);
         free(client_pubkey);          free(client_pubkey);
           sshbuf_free(shared_secret);
         kex_derive_keys(kex, hash, hashlen,          return r;
             buffer_ptr(&shared_secret), buffer_len(&shared_secret));  
         buffer_free(&shared_secret);  
         kex_finish(kex);  
 }  }
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6