]> andersk Git - openssh.git/blobdiff - sshconnect2.c
- (bal) Missed msg.[ch] in merge. Required for ssh-keysign.
[openssh.git] / sshconnect2.c
index 14e3d401a78aa77752807c64e2e043c11465b99b..6950c5ee66d55866548d0d8be9868fb8e890a6ef 100644 (file)
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.72 2001/04/18 23:43:26 markus Exp $");
-
-#include <openssl/bn.h>
-#include <openssl/md5.h>
-#include <openssl/dh.h>
-#include <openssl/hmac.h>
+RCSID("$OpenBSD: sshconnect2.c,v 1.103 2002/05/31 10:30:33 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
 #include "xmalloc.h"
-#include "rsa.h"
 #include "buffer.h"
 #include "packet.h"
-#include "uidswap.h"
 #include "compat.h"
 #include "bufaux.h"
 #include "cipher.h"
 #include "kex.h"
 #include "myproposal.h"
-#include "key.h"
 #include "sshconnect.h"
 #include "authfile.h"
-#include "cli.h"
 #include "dh.h"
 #include "authfd.h"
 #include "log.h"
@@ -54,6 +45,8 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.72 2001/04/18 23:43:26 markus Exp $");
 #include "match.h"
 #include "dispatch.h"
 #include "canohost.h"
+#include "msg.h"
+#include "pathnames.h"
 
 /* import */
 extern char *client_version_string;
@@ -72,11 +65,11 @@ struct sockaddr *xxx_hostaddr;
 
 Kex *xxx_kex = NULL;
 
-int
-check_host_key_callback(Key *hostkey)
+static int
+verify_host_key_callback(Key *hostkey)
 {
-       check_host_key(xxx_host, xxx_hostaddr, hostkey,
-           options.user_hostfile2, options.system_hostfile2);
+       if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1)
+               fatal("Host key verification failed.");
        return 0;
 }
 
@@ -112,14 +105,14 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
                myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
        }
        if (options.hostkeyalgorithms != NULL)
-               myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
+               myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
                    options.hostkeyalgorithms;
 
        /* start key exchange */
        kex = kex_setup(myproposal);
        kex->client_version_string=client_version_string;
        kex->server_version_string=server_version_string;
-       kex->check_host_key=&check_host_key_callback;
+       kex->verify_host_key=&verify_host_key_callback;
 
        xxx_kex = kex;
 
@@ -147,7 +140,7 @@ typedef struct Authmethod Authmethod;
 
 typedef int sign_cb_fn(
     Authctxt *authctxt, Key *key,
-    u_char **sigp, int *lenp, u_char *data, int datalen);
+    u_char **sigp, u_int *lenp, u_char *data, u_int datalen);
 
 struct Authctxt {
        const char *server_user;
@@ -163,8 +156,9 @@ struct Authctxt {
        int last_key_hint;
        AuthenticationConnection *agent;
        /* hostbased */
-       Key **keys;
-       int nkeys;
+       Sensitive *sensitive;
+       /* kbd-interactive */
+       int info_req_seen;
 };
 struct Authmethod {
        char    *name;          /* string to compare against server's list */
@@ -173,47 +167,46 @@ struct Authmethod {
        int     *batch_flag;    /* flag in option struct that disables method */
 };
 
-void   input_userauth_success(int type, int plen, void *ctxt);
-void   input_userauth_failure(int type, int plen, void *ctxt);
-void   input_userauth_banner(int type, int plen, void *ctxt);
-void   input_userauth_error(int type, int plen, void *ctxt);
-void   input_userauth_info_req(int type, int plen, void *ctxt);
-void   input_userauth_pk_ok(int type, int plen, void *ctxt);
+void   input_userauth_success(int, u_int32_t, void *);
+void   input_userauth_failure(int, u_int32_t, void *);
+void   input_userauth_banner(int, u_int32_t, void *);
+void   input_userauth_error(int, u_int32_t, void *);
+void   input_userauth_info_req(int, u_int32_t, void *);
+void   input_userauth_pk_ok(int, u_int32_t, void *);
+void   input_userauth_passwd_changereq(int, u_int32_t, void *);
 
-int    userauth_none(Authctxt *authctxt);
-int    userauth_pubkey(Authctxt *authctxt);
-int    userauth_passwd(Authctxt *authctxt);
-int    userauth_kbdint(Authctxt *authctxt);
-int    userauth_hostbased(Authctxt *authctxt);
+int    userauth_none(Authctxt *);
+int    userauth_pubkey(Authctxt *);
+int    userauth_passwd(Authctxt *);
+int    userauth_kbdint(Authctxt *);
+int    userauth_hostbased(Authctxt *);
 
-void   userauth(Authctxt *authctxt, char *authlist);
+void   userauth(Authctxt *, char *);
 
-int
-sign_and_send_pubkey(Authctxt *authctxt, Key *k,
-    sign_cb_fn *sign_callback);
-void   clear_auth_state(Authctxt *authctxt);
+static int sign_and_send_pubkey(Authctxt *, Key *, sign_cb_fn *);
+static void clear_auth_state(Authctxt *);
 
-Authmethod *authmethod_get(char *authlist);
-Authmethod *authmethod_lookup(const char *name);
-char *authmethods_get(void);
+static Authmethod *authmethod_get(char *authlist);
+static Authmethod *authmethod_lookup(const char *name);
+static char *authmethods_get(void);
 
 Authmethod authmethods[] = {
+       {"hostbased",
+               userauth_hostbased,
+               &options.hostbased_authentication,
+               NULL},
        {"publickey",
                userauth_pubkey,
                &options.pubkey_authentication,
                NULL},
-       {"password",
-               userauth_passwd,
-               &options.password_authentication,
-               &options.batch_mode},
        {"keyboard-interactive",
                userauth_kbdint,
                &options.kbd_interactive_authentication,
                &options.batch_mode},
-       {"hostbased",
-               userauth_hostbased,
-               &options.hostbased_authentication,
-               NULL},
+       {"password",
+               userauth_passwd,
+               &options.password_authentication,
+               &options.batch_mode},
        {"none",
                userauth_none,
                NULL,
@@ -223,13 +216,12 @@ Authmethod authmethods[] = {
 
 void
 ssh_userauth2(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys)
+    Sensitive *sensitive)
 {
        Authctxt authctxt;
        int type;
-       int plen;
 
-       if (options.challenge_reponse_authentication)
+       if (options.challenge_response_authentication)
                options.kbd_interactive_authentication = 1;
 
        debug("send SSH2_MSG_SERVICE_REQUEST");
@@ -237,24 +229,25 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
        packet_put_cstring("ssh-userauth");
        packet_send();
        packet_write_wait();
-       type = packet_read(&plen);
+       type = packet_read();
        if (type != SSH2_MSG_SERVICE_ACCEPT) {
                fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type);
        }
        if (packet_remaining() > 0) {
-               char *reply = packet_get_string(&plen);
+               char *reply = packet_get_string(NULL);
                debug("service_accept: %s", reply);
                xfree(reply);
        } else {
                debug("buggy server: service_accept w/o service");
        }
-       packet_done();
+       packet_check_eom();
        debug("got SSH2_MSG_SERVICE_ACCEPT");
 
        if (options.preferred_authentications == NULL)
                options.preferred_authentications = authmethods_get();
 
        /* setup authentication context */
+       memset(&authctxt, 0, sizeof(authctxt));
        authctxt.agent = ssh_get_authentication_connection();
        authctxt.server_user = server_user;
        authctxt.local_user = local_user;
@@ -263,8 +256,8 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
        authctxt.success = 0;
        authctxt.method = authmethod_lookup("none");
        authctxt.authlist = NULL;
-       authctxt.keys = keys;
-       authctxt.nkeys = nkeys;
+       authctxt.sensitive = sensitive;
+       authctxt.info_req_seen = 0;
        if (authctxt.method == NULL)
                fatal("ssh_userauth2: internal error: cannot send userauth none request");
 
@@ -307,13 +300,13 @@ userauth(Authctxt *authctxt, char *authlist)
        }
 }
 void
-input_userauth_error(int type, int plen, void *ctxt)
+input_userauth_error(int type, u_int32_t seq, void *ctxt)
 {
        fatal("input_userauth_error: bad message during authentication: "
           "type %d", type);
 }
 void
-input_userauth_banner(int type, int plen, void *ctxt)
+input_userauth_banner(int type, u_int32_t seq, void *ctxt)
 {
        char *msg, *lang;
        debug3("input_userauth_banner");
@@ -324,7 +317,7 @@ input_userauth_banner(int type, int plen, void *ctxt)
        xfree(lang);
 }
 void
-input_userauth_success(int type, int plen, void *ctxt)
+input_userauth_success(int type, u_int32_t seq, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
        if (authctxt == NULL)
@@ -335,7 +328,7 @@ input_userauth_success(int type, int plen, void *ctxt)
        authctxt->success = 1;                  /* break out */
 }
 void
-input_userauth_failure(int type, int plen, void *ctxt)
+input_userauth_failure(int type, u_int32_t seq, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
        char *authlist = NULL;
@@ -346,7 +339,7 @@ input_userauth_failure(int type, int plen, void *ctxt)
 
        authlist = packet_get_string(NULL);
        partial = packet_get_char();
-       packet_done();
+       packet_check_eom();
 
        if (partial != 0)
                log("Authenticated with partial success.");
@@ -356,13 +349,15 @@ input_userauth_failure(int type, int plen, void *ctxt)
        userauth(authctxt, authlist);
 }
 void
-input_userauth_pk_ok(int type, int plen, void *ctxt)
+input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
        Key *key = NULL;
        Buffer b;
-       int alen, blen, sent = 0;
-       char *pkalg, *pkblob, *fp;
+       int pktype, sent = 0;
+       u_int alen, blen;
+       char *pkalg, *fp;
+       u_char *pkblob;
 
        if (authctxt == NULL)
                fatal("input_userauth_pk_ok: no authentication context");
@@ -378,7 +373,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
                pkalg = packet_get_string(&alen);
                pkblob = packet_get_string(&blen);
        }
-       packet_done();
+       packet_check_eom();
 
        debug("input_userauth_pk_ok: pkalg %s blen %d lastkey %p hint %d",
            pkalg, blen, authctxt->last_key, authctxt->last_key_hint);
@@ -389,7 +384,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
                        debug("no last key or no sign cb");
                        break;
                }
-               if (key_type_from_name(pkalg) == KEY_UNSPEC) {
+               if ((pktype = key_type_from_name(pkalg)) == KEY_UNSPEC) {
                        debug("unknown pkalg %s", pkalg);
                        break;
                }
@@ -397,6 +392,12 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
                        debug("no key from blob. pkalg %s", pkalg);
                        break;
                }
+               if (key->type != pktype) {
+                       error("input_userauth_pk_ok: type mismatch "
+                           "for decoded key (received %d, expected %d)",
+                            key->type, pktype);
+                       break;
+               }
                fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
                debug2("input_userauth_pk_ok: fp %s", fp);
                xfree(fp);
@@ -406,7 +407,7 @@ input_userauth_pk_ok(int type, int plen, void *ctxt)
                }
                sent = sign_and_send_pubkey(authctxt, key,
                   authctxt->last_key_sign);
-       } while(0);
+       } while (0);
 
        if (key != NULL)
                key_free(key);
@@ -439,13 +440,13 @@ int
 userauth_passwd(Authctxt *authctxt)
 {
        static int attempt = 0;
-       char prompt[80];
+       char prompt[150];
        char *password;
 
        if (attempt++ >= options.number_of_password_prompts)
                return 0;
 
-       if(attempt != 1)
+       if (attempt != 1)
                error("Permission denied, please try again.");
 
        snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ",
@@ -459,15 +460,87 @@ userauth_passwd(Authctxt *authctxt)
        packet_put_cstring(password);
        memset(password, 0, strlen(password));
        xfree(password);
-       packet_inject_ignore(64);
+       packet_add_padding(64);
        packet_send();
+
+       dispatch_set(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, 
+           &input_userauth_passwd_changereq);
+
        return 1;
 }
-
+/*
+ * parse PASSWD_CHANGEREQ, prompt user and send SSH2_MSG_USERAUTH_REQUEST
+ */
 void
+input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)
+{
+       Authctxt *authctxt = ctxt;
+       char *info, *lang, *password = NULL, *retype = NULL;
+       char prompt[150];
+
+       debug2("input_userauth_passwd_changereq");
+
+       if (authctxt == NULL)
+               fatal("input_userauth_passwd_changereq: "
+                   "no authentication context");
+
+       info = packet_get_string(NULL);
+       lang = packet_get_string(NULL);
+       if (strlen(info) > 0)
+               log("%s", info);
+       xfree(info);
+       xfree(lang);
+       packet_start(SSH2_MSG_USERAUTH_REQUEST);
+       packet_put_cstring(authctxt->server_user);
+       packet_put_cstring(authctxt->service);
+       packet_put_cstring(authctxt->method->name);
+       packet_put_char(1);                     /* additional info */
+       snprintf(prompt, sizeof(prompt), 
+           "Enter %.30s@%.128s's old password: ",
+           authctxt->server_user, authctxt->host);
+       password = read_passphrase(prompt, 0);
+       packet_put_cstring(password);
+       memset(password, 0, strlen(password));
+       xfree(password);
+       password = NULL;
+       while (password == NULL) {
+               snprintf(prompt, sizeof(prompt), 
+                   "Enter %.30s@%.128s's new password: ",
+                   authctxt->server_user, authctxt->host);
+               password = read_passphrase(prompt, RP_ALLOW_EOF);
+               if (password == NULL) {
+                       /* bail out */
+                       return;
+               }
+               snprintf(prompt, sizeof(prompt), 
+                   "Retype %.30s@%.128s's new password: ",
+                   authctxt->server_user, authctxt->host);
+               retype = read_passphrase(prompt, 0);
+               if (strcmp(password, retype) != 0) {
+                       memset(password, 0, strlen(password));
+                       xfree(password);
+                       log("Mismatch; try again, EOF to quit.");
+                       password = NULL;
+               }
+               memset(retype, 0, strlen(retype));
+               xfree(retype);
+       }
+       packet_put_cstring(password);
+       memset(password, 0, strlen(password));
+       xfree(password);
+       packet_add_padding(64);
+       packet_send();
+       
+       dispatch_set(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, 
+           &input_userauth_passwd_changereq);
+}
+
+static void
 clear_auth_state(Authctxt *authctxt)
 {
        /* XXX clear authentication state */
+       dispatch_set(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, NULL);
+
        if (authctxt->last_key != NULL && authctxt->last_key_hint == -1) {
                debug3("clear_auth_state: key_free %p", authctxt->last_key);
                key_free(authctxt->last_key);
@@ -477,12 +550,12 @@ clear_auth_state(Authctxt *authctxt)
        authctxt->last_key_sign = NULL;
 }
 
-int
+static int
 sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback)
 {
        Buffer b;
        u_char *blob, *signature;
-       int bloblen, slen;
+       u_int bloblen, slen;
        int skip = 0;
        int ret = -1;
        int have_sig = 1;
@@ -562,12 +635,12 @@ sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback)
        return 1;
 }
 
-int
+static int
 send_pubkey_test(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback,
     int hint)
 {
        u_char *blob;
-       int bloblen, have_sig = 0;
+       u_int bloblen, have_sig = 0;
 
        debug3("send_pubkey_test");
 
@@ -595,7 +668,7 @@ send_pubkey_test(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback,
        return 1;
 }
 
-Key *
+static Key *
 load_identity_file(char *filename)
 {
        Key *private;
@@ -612,7 +685,7 @@ load_identity_file(char *filename)
                if (options.batch_mode)
                        return NULL;
                snprintf(prompt, sizeof prompt,
-                    "Enter passphrase for key '%.100s': ", filename);
+                   "Enter passphrase for key '%.100s': ", filename);
                for (i = 0; i < options.number_of_password_prompts; i++) {
                        passphrase = read_passphrase(prompt, 0);
                        if (strcmp(passphrase, "") != 0) {
@@ -633,9 +706,9 @@ load_identity_file(char *filename)
        return private;
 }
 
-int
-identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+static int
+identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
 {
        Key *private;
        int idx, ret;
@@ -643,6 +716,11 @@ identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp,
        idx = authctxt->last_key_hint;
        if (idx < 0)
                return -1;
+
+       /* private key is stored in external hardware */
+       if (options.identity_keys[idx]->flags & KEY_FLAG_EXT)
+               return key_sign(options.identity_keys[idx], sigp, lenp, data, datalen);
+
        private = load_identity_file(options.identity_files[idx]);
        if (private == NULL)
                return -1;
@@ -651,19 +729,21 @@ identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp,
        return ret;
 }
 
-int agent_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+static int
+agent_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
 {
        return ssh_agent_sign(authctxt->agent, key, sigp, lenp, data, datalen);
 }
 
-int key_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp,
-    u_char *data, int datalen)
+static int
+key_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
 {
        return key_sign(key, sigp, lenp, data, datalen);
 }
 
-int
+static int
 userauth_pubkey_agent(Authctxt *authctxt)
 {
        static int called = 0;
@@ -702,7 +782,7 @@ userauth_pubkey(Authctxt *authctxt)
        if (authctxt->agent != NULL) {
                do {
                        sent = userauth_pubkey_agent(authctxt);
-               } while(!sent && authctxt->agent->howmany > 0);
+               } while (!sent && authctxt->agent->howmany > 0);
        }
        while (!sent && idx < options.num_identity_files) {
                key = options.identity_keys[idx];
@@ -735,6 +815,12 @@ userauth_kbdint(Authctxt *authctxt)
 
        if (attempt++ >= options.number_of_password_prompts)
                return 0;
+       /* disable if no SSH2_MSG_USERAUTH_INFO_REQUEST has been seen */
+       if (attempt > 1 && !authctxt->info_req_seen) {
+               debug3("userauth_kbdint: disable: no info_req_seen");
+               dispatch_set(SSH2_MSG_USERAUTH_INFO_REQUEST, NULL);
+               return 0;
+       }
 
        debug2("userauth_kbdint");
        packet_start(SSH2_MSG_USERAUTH_REQUEST);
@@ -754,7 +840,7 @@ userauth_kbdint(Authctxt *authctxt)
  * parse INFO_REQUEST, prompt user and send INFO_RESPONSE
  */
 void
-input_userauth_info_req(int type, int plen, void *ctxt)
+input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
        char *name, *inst, *lang, *prompt, *response;
@@ -766,13 +852,15 @@ input_userauth_info_req(int type, int plen, void *ctxt)
        if (authctxt == NULL)
                fatal("input_userauth_info_req: no authentication context");
 
+       authctxt->info_req_seen = 1;
+
        name = packet_get_string(NULL);
        inst = packet_get_string(NULL);
        lang = packet_get_string(NULL);
        if (strlen(name) > 0)
-               cli_mesg(name);
+               log("%s", name);
        if (strlen(inst) > 0)
-               cli_mesg(inst);
+               log("%s", inst);
        xfree(name);
        xfree(inst);
        xfree(lang);
@@ -787,31 +875,106 @@ input_userauth_info_req(int type, int plen, void *ctxt)
        packet_start(SSH2_MSG_USERAUTH_INFO_RESPONSE);
        packet_put_int(num_prompts);
 
+       debug2("input_userauth_info_req: num_prompts %d", num_prompts);
        for (i = 0; i < num_prompts; i++) {
                prompt = packet_get_string(NULL);
                echo = packet_get_char();
 
-               response = cli_prompt(prompt, echo);
+               response = read_passphrase(prompt, echo ? RP_ECHO : 0);
 
                packet_put_cstring(response);
                memset(response, 0, strlen(response));
                xfree(response);
                xfree(prompt);
        }
-       packet_done(); /* done with parsing incoming message. */
+       packet_check_eom(); /* done with parsing incoming message. */
 
-       packet_inject_ignore(64);
+       packet_add_padding(64);
        packet_send();
 }
 
-/*
- * this will be move to an external program (ssh-keysign) ASAP. ssh-keysign
- * will be setuid-root and the sbit can be removed from /usr/bin/ssh.
- */
+static int
+ssh_keysign(
+    Key *key,
+    u_char **sigp, u_int *lenp,
+    u_char *data, u_int datalen)
+{
+       Buffer b;
+       struct stat st;
+       pid_t pid;
+       int to[2], from[2], status, version = 2;
+
+       debug("ssh_keysign called");
+
+       if (stat(_PATH_SSH_KEY_SIGN, &st) < 0) {
+               error("ssh_keysign: no installed: %s", strerror(errno));
+               return -1;
+       }
+       if (fflush(stdout) != 0)
+               error("ssh_keysign: fflush: %s", strerror(errno));
+       if (pipe(to) < 0) {
+               error("ssh_keysign: pipe: %s", strerror(errno));
+               return -1;
+       }
+       if (pipe(from) < 0) {
+               error("ssh_keysign: pipe: %s", strerror(errno));
+               return -1;
+       }
+       if ((pid = fork()) < 0) {
+               error("ssh_keysign: fork: %s", strerror(errno));
+               return -1;
+       }
+       if (pid == 0) {
+               seteuid(getuid());
+               setuid(getuid());
+               close(from[0]);
+               if (dup2(from[1], STDOUT_FILENO) < 0)
+                       fatal("ssh_keysign: dup2: %s", strerror(errno));
+               close(to[1]);
+               if (dup2(to[0], STDIN_FILENO) < 0)
+                       fatal("ssh_keysign: dup2: %s", strerror(errno));
+               close(from[1]);
+               close(to[0]);
+               execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0);
+               fatal("ssh_keysign: exec(%s): %s", _PATH_SSH_KEY_SIGN,
+                   strerror(errno));
+       }
+       close(from[1]);
+       close(to[0]);
+
+       buffer_init(&b);
+       buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */
+       buffer_put_string(&b, data, datalen);
+       msg_send(to[1], version, &b);
+
+       if (msg_recv(from[0], &b) < 0) {
+               error("ssh_keysign: no reply");
+               buffer_clear(&b);
+               return -1;
+       }
+       close(from[0]);
+       close(to[1]);
+
+       while (waitpid(pid, &status, 0) < 0)
+               if (errno != EINTR)
+                       break;
+
+       if (buffer_get_char(&b) != version) {
+               error("ssh_keysign: bad version");
+               buffer_clear(&b);
+               return -1;
+       }
+       *sigp = buffer_get_string(&b, lenp);
+       buffer_clear(&b);
+
+       return 0;
+}
+
 int
 userauth_hostbased(Authctxt *authctxt)
 {
        Key *private = NULL;
+       Sensitive *sensitive = authctxt->sensitive;
        Buffer b;
        u_char *signature, *blob;
        char *chost, *pkalg, *p;
@@ -819,35 +982,37 @@ userauth_hostbased(Authctxt *authctxt)
        u_int blen, slen;
        int ok, i, len, found = 0;
 
-       p = get_local_name(packet_get_connection_in());
-       if (p == NULL) {
-               error("userauth_hostbased: cannot get local ipaddr/name");
-               return 0;
-       }
-       len = strlen(p) + 2;
-       chost = xmalloc(len);
-       strlcpy(chost, p, len);
-       strlcat(chost, ".", len);
-       debug2("userauth_hostbased: chost %s", chost);
        /* check for a useful key */
-       for (i = 0; i < authctxt->nkeys; i++) {
-               private = authctxt->keys[i];
+       for (i = 0; i < sensitive->nkeys; i++) {
+               private = sensitive->keys[i];
                if (private && private->type != KEY_RSA1) {
                        found = 1;
                        /* we take and free the key */
-                       authctxt->keys[i] = NULL;
+                       sensitive->keys[i] = NULL;
                        break;
                }
        }
        if (!found) {
-               xfree(chost);
+               debug("userauth_hostbased: no more client hostkeys");
                return 0;
        }
        if (key_to_blob(private, &blob, &blen) == 0) {
                key_free(private);
-               xfree(chost);
                return 0;
        }
+       /* figure out a name for the client host */
+       p = get_local_name(packet_get_connection_in());
+       if (p == NULL) {
+               error("userauth_hostbased: cannot get local ipaddr/name");
+               key_free(private);
+               return 0;
+       }
+       len = strlen(p) + 2;
+       chost = xmalloc(len);
+       strlcpy(chost, p, len);
+       strlcat(chost, ".", len);
+       debug2("userauth_hostbased: chost %s", chost);
+
        service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" :
            authctxt->service;
        pkalg = xstrdup(key_ssh_name(private));
@@ -865,8 +1030,12 @@ userauth_hostbased(Authctxt *authctxt)
 #ifdef DEBUG_PK
        buffer_dump(&b);
 #endif
-       debug2("xxx: chost %s", chost);
-       ok = key_sign(private, &signature, &slen, buffer_ptr(&b), buffer_len(&b));
+       if (sensitive->external_keysign)
+               ok = ssh_keysign(private, &signature, &slen,
+                   buffer_ptr(&b), buffer_len(&b));
+       else
+               ok = key_sign(private, &signature, &slen,
+                   buffer_ptr(&b), buffer_len(&b));
        key_free(private);
        buffer_free(&b);
        if (ok != 0) {
@@ -899,7 +1068,7 @@ userauth_hostbased(Authctxt *authctxt)
  * given auth method name, if configurable options permit this method fill
  * in auth_ident field and return true, otherwise return false.
  */
-int
+static int
 authmethod_is_enabled(Authmethod *method)
 {
        if (method == NULL)
@@ -913,7 +1082,7 @@ authmethod_is_enabled(Authmethod *method)
        return 1;
 }
 
-Authmethod *
+static Authmethod *
 authmethod_lookup(const char *name)
 {
        Authmethod *method = NULL;
@@ -934,12 +1103,12 @@ static char *preferred = NULL;
  * next method we should try.  If the server initially sends a nil list,
  * use a built-in default list.
  */
-Authmethod *
+static Authmethod *
 authmethod_get(char *authlist)
 {
 
        char *name = NULL;
-       int next;
+       u_int next;
 
        /* Use a suitable default if we're passed a nil list.  */
        if (authlist == NULL || strlen(authlist) == 0)
@@ -974,21 +1143,23 @@ authmethod_get(char *authlist)
        }
 }
 
-
-#define        DELIM   ","
-char *
+static char *
 authmethods_get(void)
 {
        Authmethod *method = NULL;
-       char buf[1024];
+       Buffer b;
+       char *list;
 
-       buf[0] = '\0';
+       buffer_init(&b);
        for (method = authmethods; method->name != NULL; method++) {
                if (authmethod_is_enabled(method)) {
-                       if (buf[0] != '\0')
-                               strlcat(buf, DELIM, sizeof buf);
-                       strlcat(buf, method->name, sizeof buf);
+                       if (buffer_len(&b) > 0)
+                               buffer_append(&b, ",", 1);
+                       buffer_append(&b, method->name, strlen(method->name));
                }
        }
-       return xstrdup(buf);
+       buffer_append(&b, "\0", 1);
+       list = xstrdup(buffer_ptr(&b));
+       buffer_free(&b);
+       return list;
 }
This page took 0.090277 seconds and 4 git commands to generate.