=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.116.2.5 retrieving revision 1.117 diff -u -r1.116.2.5 -r1.117 --- src/usr.bin/ssh/ssh.c 2002/06/02 22:56:11 1.116.2.5 +++ src/usr.bin/ssh/ssh.c 2001/04/30 11:18:52 1.117 @@ -13,7 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". * * Copyright (c) 1999 Niels Provos. All rights reserved. - * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved. * * Modified to work with SSL by Niels Provos * in Canada (German citizen). @@ -40,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.116.2.5 2002/06/02 22:56:11 miod Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.117 2001/04/30 11:18:52 markus Exp $"); #include #include @@ -70,10 +69,6 @@ #include "mac.h" #include "sshtty.h" -#ifdef SMARTCARD -#include "scard.h" -#endif - extern char *__progname; /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. @@ -110,9 +105,6 @@ */ Options options; -/* optional user configfile */ -char *config = NULL; - /* * Name of the host we are connecting to. This is the name given on the * command line, or the HostName specified for the user-supplied name in a @@ -123,6 +115,14 @@ /* socket address the host resolves to */ struct sockaddr_storage hostaddr; +/* + * Flag to indicate that we have received a window change signal which has + * not yet been processed. This will cause a message indicating the new + * window size to be sent to the server a little later. This is volatile + * because this is updated in a signal handler. + */ +volatile int received_window_change_signal = 0; + /* Private host keys. */ struct { Key **keys; @@ -138,32 +138,24 @@ /* Should we execute a command or invoke a subsystem? */ int subsystem_flag = 0; -/* # of replies received for global requests */ -static int client_global_request_id = 0; - /* Prints a help message to the user. This function never returns. */ -static void +void usage(void) { fprintf(stderr, "Usage: %s [options] host [command]\n", __progname); fprintf(stderr, "Options:\n"); fprintf(stderr, " -l user Log in using this user name.\n"); fprintf(stderr, " -n Redirect input from " _PATH_DEVNULL ".\n"); - fprintf(stderr, " -F config Config file (default: ~/%s).\n", - _PATH_SSH_USER_CONFFILE); fprintf(stderr, " -A Enable authentication agent forwarding.\n"); - fprintf(stderr, " -a Disable authentication agent forwarding (default).\n"); + fprintf(stderr, " -a Disable authentication agent forwarding.\n"); #ifdef AFS fprintf(stderr, " -k Disable Kerberos ticket and AFS token forwarding.\n"); #endif /* AFS */ fprintf(stderr, " -X Enable X11 connection forwarding.\n"); - fprintf(stderr, " -x Disable X11 connection forwarding (default).\n"); + fprintf(stderr, " -x Disable X11 connection forwarding.\n"); fprintf(stderr, " -i file Identity for public key authentication " "(default: ~/.ssh/identity)\n"); -#ifdef SMARTCARD - fprintf(stderr, " -I reader Set smartcard reader.\n"); -#endif fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); fprintf(stderr, " -T Do not allocate a tty.\n"); fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); @@ -174,14 +166,14 @@ fprintf(stderr, " -f Fork into background after authentication.\n"); fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n"); - fprintf(stderr, " -c cipher Select encryption algorithm\n"); + fprintf(stderr, " -c cipher Select encryption algorithm: " + "``3des'', ``blowfish''\n"); fprintf(stderr, " -m macs Specify MAC algorithms for protocol version 2.\n"); fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n"); fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n"); fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n"); fprintf(stderr, " These cause %s to listen for connections on a port, and\n", __progname); fprintf(stderr, " forward them to the other side by connecting to host:port.\n"); - fprintf(stderr, " -D port Enable dynamic application-level port forwarding.\n"); fprintf(stderr, " -C Enable compression.\n"); fprintf(stderr, " -N Do not execute a shell or command.\n"); fprintf(stderr, " -g Allow remote hosts to connect to forwarded ports.\n"); @@ -191,7 +183,7 @@ fprintf(stderr, " -6 Use IPv6 only.\n"); fprintf(stderr, " -o 'option' Process the option as if it was read from a configuration file.\n"); fprintf(stderr, " -s Invoke command (mandatory) as SSH2 subsystem.\n"); - fprintf(stderr, " -b addr Local IP address.\n"); + fprintf(stderr, " -b Local IP address.\n"); exit(1); } @@ -199,7 +191,7 @@ * Connects to the given host using rsh (or prints an error message and exits * if rsh is not available). This function never returns. */ -static void +void rsh_connect(char *host, char *user, Buffer * command) { char *args[10]; @@ -233,9 +225,9 @@ exit(1); } -static int ssh_session(void); -static int ssh_session2(void); -static void load_public_identity_files(void); +int ssh_session(void); +int ssh_session2(void); +void load_public_identity_files(void); /* * Main program for the ssh client. @@ -243,16 +235,13 @@ int main(int ac, char **av) { - int i, opt, exit_status, cerr; + int i, opt, optind, exit_status, ok; u_short fwd_port, fwd_host_port; - char sfwd_port[6], sfwd_host_port[6]; - char *p, *cp, buf[256]; + char *optarg, *cp, buf[256]; struct stat st; struct passwd *pw; int dummy; uid_t original_effective_uid; - extern int optind, optreset; - extern char *optarg; /* * Save the original real uid. It will be needed later (uid-swapping @@ -300,9 +289,35 @@ /* Parse command-line arguments. */ host = NULL; -again: - while ((opt = getopt(ac, av, - "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) { + for (optind = 1; optind < ac; optind++) { + if (av[optind][0] != '-') { + if (host) + break; + if ((cp = strchr(av[optind], '@'))) { + if(cp == av[optind]) + usage(); + options.user = av[optind]; + *cp = '\0'; + host = ++cp; + } else + host = av[optind]; + continue; + } + opt = av[optind][1]; + if (!opt) + usage(); + if (strchr("eilcmpbLRDo", opt)) { /* options with arguments */ + optarg = av[optind] + 2; + if (strcmp(optarg, "") == 0) { + if (optind >= ac - 1) + usage(); + optarg = av[++optind]; + } + } else { + if (av[optind][2]) + usage(); + optarg = NULL; + } switch (opt) { case '1': options.protocol = SSH_PROTO_1; @@ -349,24 +364,15 @@ #endif case 'i': if (stat(optarg, &st) < 0) { - fprintf(stderr, "Warning: Identity file %s " - "does not exist.\n", optarg); + fprintf(stderr, "Warning: Identity file %s does not exist.\n", + optarg); break; } - if (options.num_identity_files >= - SSH_MAX_IDENTITY_FILES) - fatal("Too many identity files specified " - "(max %d)", SSH_MAX_IDENTITY_FILES); - options.identity_files[options.num_identity_files++] = - xstrdup(optarg); + if (options.num_identity_files >= SSH_MAX_IDENTITY_FILES) + fatal("Too many identity files specified (max %d)", + SSH_MAX_IDENTITY_FILES); + options.identity_files[options.num_identity_files++] = xstrdup(optarg); break; - case 'I': -#ifdef SMARTCARD - options.smartcard_device = xstrdup(optarg); -#else - fprintf(stderr, "no support for smartcards.\n"); -#endif - break; case 't': if (tty_flag) force_tty_flag = 1; @@ -379,8 +385,9 @@ } else if (options.log_level < SYSLOG_LEVEL_DEBUG3) { options.log_level++; break; - } else + } else { fatal("Too high debugging level."); + } /* fallthrough */ case 'V': fprintf(stderr, @@ -397,16 +404,14 @@ break; case 'e': if (optarg[0] == '^' && optarg[2] == 0 && - (u_char) optarg[1] >= 64 && - (u_char) optarg[1] < 128) + (u_char) optarg[1] >= 64 && (u_char) optarg[1] < 128) options.escape_char = (u_char) optarg[1] & 31; else if (strlen(optarg) == 1) options.escape_char = (u_char) optarg[0]; else if (strcmp(optarg, "none") == 0) - options.escape_char = SSH_ESCAPECHAR_NONE; + options.escape_char = -2; else { - fprintf(stderr, "Bad escape character '%s'.\n", - optarg); + fprintf(stderr, "Bad escape character '%s'.\n", optarg); exit(1); } break; @@ -419,25 +424,23 @@ /* SSH1 only */ options.cipher = cipher_number(optarg); if (options.cipher == -1) { - fprintf(stderr, - "Unknown cipher type '%s'\n", - optarg); + fprintf(stderr, "Unknown cipher type '%s'\n", optarg); exit(1); } - if (options.cipher == SSH_CIPHER_3DES) + if (options.cipher == SSH_CIPHER_3DES) { options.ciphers = "3des-cbc"; - else if (options.cipher == SSH_CIPHER_BLOWFISH) + } else if (options.cipher == SSH_CIPHER_BLOWFISH) { options.ciphers = "blowfish-cbc"; - else + } else { options.ciphers = (char *)-1; + } } break; case 'm': if (mac_valid(optarg)) options.macs = xstrdup(optarg); else { - fprintf(stderr, "Unknown mac type '%s'\n", - optarg); + fprintf(stderr, "Unknown mac type '%s'\n", optarg); exit(1); } break; @@ -451,38 +454,33 @@ case 'l': options.user = optarg; break; - - case 'L': case 'R': - if (sscanf(optarg, "%5[0-9]:%255[^:]:%5[0-9]", - sfwd_port, buf, sfwd_host_port) != 3 && - sscanf(optarg, "%5[0-9]/%255[^/]/%5[0-9]", - sfwd_port, buf, sfwd_host_port) != 3) { - fprintf(stderr, - "Bad forwarding specification '%s'\n", - optarg); + if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf, + &fwd_host_port) != 3 && + sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf, + &fwd_host_port) != 3) { + fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg); usage(); /* NOTREACHED */ } - if ((fwd_port = a2port(sfwd_port)) == 0 || - (fwd_host_port = a2port(sfwd_host_port)) == 0) { - fprintf(stderr, - "Bad forwarding port(s) '%s'\n", optarg); - exit(1); + add_remote_forward(&options, fwd_port, buf, fwd_host_port); + break; + case 'L': + if (sscanf(optarg, "%hu/%255[^/]/%hu", &fwd_port, buf, + &fwd_host_port) != 3 && + sscanf(optarg, "%hu:%255[^:]:%hu", &fwd_port, buf, + &fwd_host_port) != 3) { + fprintf(stderr, "Bad forwarding specification '%s'.\n", optarg); + usage(); + /* NOTREACHED */ } - if (opt == 'L') - add_local_forward(&options, fwd_port, buf, - fwd_host_port); - else if (opt == 'R') - add_remote_forward(&options, fwd_port, buf, - fwd_host_port); + add_local_forward(&options, fwd_port, buf, fwd_host_port); break; case 'D': fwd_port = a2port(optarg); if (fwd_port == 0) { - fprintf(stderr, "Bad dynamic port '%s'\n", - optarg); + fprintf(stderr, "Bad dynamic port '%s'\n", optarg); exit(1); } add_local_forward(&options, fwd_port, "socks4", 0); @@ -500,8 +498,8 @@ break; case 'o': dummy = 1; - if (process_config_line(&options, host ? host : "", - optarg, "command-line", 0, &dummy) != 0) + if (process_config_line(&options, host ? host : "", optarg, + "command-line", 0, &dummy) != 0) exit(1); break; case 's': @@ -510,43 +508,17 @@ case 'b': options.bind_address = optarg; break; - case 'F': - config = optarg; - break; default: usage(); } } - ac -= optind; - av += optind; - - if (ac > 0 && !host && **av != '-') { - if (strchr(*av, '@')) { - p = xstrdup(*av); - cp = strchr(p, '@'); - if (cp == NULL || cp == p) - usage(); - options.user = p; - *cp = '\0'; - host = ++cp; - } else - host = *av; - ac--, av++; - if (ac > 0) { - optind = 0; - optreset = 1; - goto again; - } - } - /* Check that we got a host name. */ if (!host) usage(); SSLeay_add_all_algorithms(); ERR_load_crypto_strings(); - channel_set_af(IPv4or6); /* Initialize the command to execute on remote host. */ buffer_init(&command); @@ -556,18 +528,18 @@ * is no limit on the length of the command, except by the maximum * packet size. Also sets the tty flag if there is no command. */ - if (!ac) { + if (optind == ac) { /* No command specified - execute shell on a tty. */ tty_flag = 1; if (subsystem_flag) { - fprintf(stderr, - "You must specify a subsystem to invoke.\n"); + fprintf(stderr, "You must specify a subsystem to invoke.\n"); usage(); } } else { - /* A command has been specified. Store it into the buffer. */ - for (i = 0; i < ac; i++) { - if (i) + /* A command has been specified. Store it into the + buffer. */ + for (i = optind; i < ac; i++) { + if (i > optind) buffer_append(&command, " ", 1); buffer_append(&command, av[i], strlen(av[i])); } @@ -598,22 +570,12 @@ log_init(av[0], options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, SYSLOG_FACILITY_USER, 1); - /* - * Read per-user configuration file. Ignore the system wide config - * file if the user specifies a config file on the command line. - */ - if (config != NULL) { - if (!read_config_file(config, host, &options)) - fatal("Can't open user config file %.100s: " - "%.100s", config, strerror(errno)); - } else { - snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, - _PATH_SSH_USER_CONFFILE); - (void)read_config_file(buf, host, &options); + /* Read per-user configuration file. */ + snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); + read_config_file(buf, host, &options); - /* Read systemwide configuration file after use config. */ - (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); - } + /* Read systemwide configuration file. */ + read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); /* Fill configuration defaults. */ fill_default_options(&options); @@ -656,7 +618,7 @@ /* Open a connection to the remote host. */ - cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6, + ok = ssh_connect(host, &hostaddr, options.port, options.connection_attempts, original_effective_uid != 0 || !options.use_privileged_port, pw, options.proxy_command); @@ -669,7 +631,7 @@ */ sensitive_data.nkeys = 0; sensitive_data.keys = NULL; - if (!cerr && (options.rhosts_rsa_authentication || + if (ok && (options.rhosts_rsa_authentication || options.hostbased_authentication)) { sensitive_data.nkeys = 3; sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); @@ -701,25 +663,26 @@ * Now that we are back to our own permissions, create ~/.ssh * directory if it doesn\'t already exist. */ - snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); + snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_DIR); if (stat(buf, &st) < 0) if (mkdir(buf, 0700) < 0) error("Could not create directory '%.200s'.", buf); /* Check if the connection failed, and try "rsh" if appropriate. */ - if (cerr) { - if (!options.fallback_to_rsh) - exit(1); + if (!ok) { if (options.port != 0) - log("Secure connection to %.100s on port %hu refused; " - "reverting to insecure method", - host, options.port); + log("Secure connection to %.100s on port %hu refused%.100s.", + host, options.port, + options.fallback_to_rsh ? "; reverting to insecure method" : ""); else - log("Secure connection to %.100s refused; " - "reverting to insecure method.", host); + log("Secure connection to %.100s refused%.100s.", host, + options.fallback_to_rsh ? "; reverting to insecure method" : ""); - rsh_connect(host, options.user, &command); - fatal("rsh_connect returned"); + if (options.fallback_to_rsh) { + rsh_connect(host, options.user, &command); + fatal("rsh_connect returned"); + } + exit(1); } /* load options.identity_files */ load_public_identity_files(); @@ -735,8 +698,6 @@ options.user_hostfile2 = tilde_expand_filename(options.user_hostfile2, original_real_uid); - signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */ - /* Log into the remote system. This never returns if the login fails. */ ssh_login(sensitive_data.keys, sensitive_data.nkeys, host, (struct sockaddr *)&hostaddr, pw); @@ -753,53 +714,26 @@ } xfree(sensitive_data.keys); } - for (i = 0; i < options.num_identity_files; i++) { - if (options.identity_files[i]) { - xfree(options.identity_files[i]); - options.identity_files[i] = NULL; - } - if (options.identity_keys[i]) { - key_free(options.identity_keys[i]); - options.identity_keys[i] = NULL; - } - } exit_status = compat20 ? ssh_session2() : ssh_session(); packet_close(); return exit_status; } -static void -x11_get_proto(char **_proto, char **_data) +void +x11_get_proto(char *proto, int proto_len, char *data, int data_len) { char line[512]; - static char proto[512], data[512]; FILE *f; int got_data = 0, i; - char *display; - *_proto = proto; - *_data = data; - proto[0] = data[0] = '\0'; - if (options.xauth_location && (display = getenv("DISPLAY"))) { + if (options.xauth_location) { /* Try to get Xauthority information for the display. */ - if (strncmp(display, "localhost:", 10) == 0) - /* - * Handle FamilyLocal case where $DISPLAY does - * not match an authorization entry. For this we - * just try "xauth list unix:displaynum.screennum". - * XXX: "localhost" match to determine FamilyLocal - * is not perfect. - */ - snprintf(line, sizeof line, "%.100s list unix:%s 2>" - _PATH_DEVNULL, options.xauth_location, display+10); - else - snprintf(line, sizeof line, "%.100s list %.200s 2>" - _PATH_DEVNULL, options.xauth_location, display); - debug2("x11_get_proto %s", line); + snprintf(line, sizeof line, "%.100s list %.200s 2>" _PATH_DEVNULL, + options.xauth_location, getenv("DISPLAY")); f = popen(line, "r"); if (f && fgets(line, sizeof(line), f) && - sscanf(line, "%*s %511s %511s", proto, data) == 2) + sscanf(line, "%*s %s %s", proto, data) == 2) got_data = 1; if (f) pclose(f); @@ -815,17 +749,17 @@ if (!got_data) { u_int32_t rand = 0; - strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto); + strlcpy(proto, "MIT-MAGIC-COOKIE-1", proto_len); for (i = 0; i < 16; i++) { if (i % 4 == 0) rand = arc4random(); - snprintf(data + 2 * i, sizeof data - 2 * i, "%02x", rand & 0xff); + snprintf(data + 2 * i, data_len - 2 * i, "%02x", rand & 0xff); rand >>= 8; } } } -static void +void ssh_init_forwarding(void) { int success = 0; @@ -837,7 +771,7 @@ options.local_forwards[i].port, options.local_forwards[i].host, options.local_forwards[i].host_port); - success += channel_setup_local_fwd_listener( + success += channel_request_local_forwarding( options.local_forwards[i].port, options.local_forwards[i].host, options.local_forwards[i].host_port, @@ -859,7 +793,7 @@ } } -static void +void check_agent_present(void) { if (options.forward_agent) { @@ -872,10 +806,11 @@ } } -static int +int ssh_session(void) { int type; + int plen; int interactive = 0; int have_tty = 0; struct winsize ws; @@ -893,7 +828,7 @@ packet_put_int(options.compression_level); packet_send(); packet_write_wait(); - type = packet_read(); + type = packet_read(&plen); if (type == SSH_SMSG_SUCCESS) packet_start_compression(options.compression_level); else if (type == SSH_SMSG_FAILURE) @@ -913,7 +848,7 @@ cp = getenv("TERM"); if (!cp) cp = ""; - packet_put_cstring(cp); + packet_put_string(cp, strlen(cp)); /* Store window size in the packet. */ if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0) @@ -931,7 +866,7 @@ packet_write_wait(); /* Read response from the server. */ - type = packet_read(); + type = packet_read(&plen); if (type == SSH_SMSG_SUCCESS) { interactive = 1; have_tty = 1; @@ -942,15 +877,15 @@ } /* Request X11 forwarding if enabled and DISPLAY is set. */ if (options.forward_x11 && getenv("DISPLAY") != NULL) { - char *proto, *data; + char proto[512], data[512]; /* Get reasonable local authentication information. */ - x11_get_proto(&proto, &data); + x11_get_proto(proto, sizeof proto, data, sizeof data); /* Request forwarding with authentication spoofing. */ debug("Requesting X11 forwarding with authentication spoofing."); x11_request_forwarding_with_spoofing(0, proto, data); /* Read response from the server. */ - type = packet_read(); + type = packet_read(&plen); if (type == SSH_SMSG_SUCCESS) { interactive = 1; } else if (type == SSH_SMSG_FAILURE) { @@ -970,8 +905,8 @@ auth_request_forwarding(); /* Read response from the server. */ - type = packet_read(); - packet_check_eom(); + type = packet_read(&plen); + packet_integrity_check(plen, 0, type); if (type != SSH_SMSG_SUCCESS) log("Warning: Remote host denied authentication agent forwarding."); } @@ -992,7 +927,7 @@ int len = buffer_len(&command); if (len > 900) len = 900; - debug("Sending command: %.*s", len, (u_char *)buffer_ptr(&command)); + debug("Sending command: %.*s", len, buffer_ptr(&command)); packet_start(SSH_CMSG_EXEC_CMD); packet_put_string(buffer_ptr(&command), buffer_len(&command)); packet_send(); @@ -1005,12 +940,11 @@ } /* Enter the interactive session. */ - return client_loop(have_tty, tty_flag ? - options.escape_char : SSH_ESCAPECHAR_NONE, 0); + return client_loop(have_tty, tty_flag ? options.escape_char : -1, 0); } -static void -client_subsystem_reply(int type, u_int32_t seq, void *ctxt) +void +client_subsystem_reply(int type, int plen, void *ctxt) { int id, len; @@ -1018,42 +952,20 @@ len = buffer_len(&command); if (len > 900) len = 900; - packet_check_eom(); + packet_done(); if (type == SSH2_MSG_CHANNEL_FAILURE) fatal("Request for subsystem '%.*s' failed on channel %d", - len, (u_char *)buffer_ptr(&command), id); + len, buffer_ptr(&command), id); } void -client_global_request_reply(int type, u_int32_t seq, void *ctxt) +ssh_session2_callback(int id, void *arg) { - int i; - - i = client_global_request_id++; - if (i >= options.num_remote_forwards) { - debug("client_global_request_reply: too many replies %d > %d", - i, options.num_remote_forwards); - return; - } - debug("remote forward %s for: listen %d, connect %s:%d", - type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", - options.remote_forwards[i].port, - options.remote_forwards[i].host, - options.remote_forwards[i].host_port); - if (type == SSH2_MSG_REQUEST_FAILURE) - log("Warning: remote port forwarding failed for listen port %d", - options.remote_forwards[i].port); -} - -/* request pty/x11/agent/tcpfwd/shell for channel */ -static void -ssh_session2_setup(int id, void *arg) -{ int len; int interactive = 0; struct termios tio; - debug("ssh_session2_setup: id %d", id); + debug("client_init id %d arg %ld", id, (long)arg); if (tty_flag) { struct winsize ws; @@ -1079,9 +991,9 @@ } if (options.forward_x11 && getenv("DISPLAY") != NULL) { - char *proto, *data; + char proto[512], data[512]; /* Get reasonable local authentication information. */ - x11_get_proto(&proto, &data); + x11_get_proto(proto, sizeof proto, data, sizeof data); /* Request forwarding with authentication spoofing. */ debug("Requesting X11 forwarding with authentication spoofing."); x11_request_forwarding_with_spoofing(id, proto, data); @@ -1101,32 +1013,32 @@ if (len > 900) len = 900; if (subsystem_flag) { - debug("Sending subsystem: %.*s", len, (u_char *)buffer_ptr(&command)); + debug("Sending subsystem: %.*s", len, buffer_ptr(&command)); channel_request_start(id, "subsystem", /*want reply*/ 1); /* register callback for reply */ /* XXX we asume that client_loop has already been called */ dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &client_subsystem_reply); dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &client_subsystem_reply); } else { - debug("Sending command: %.*s", len, (u_char *)buffer_ptr(&command)); + debug("Sending command: %.*s", len, buffer_ptr(&command)); channel_request_start(id, "exec", 0); } packet_put_string(buffer_ptr(&command), buffer_len(&command)); packet_send(); } else { - channel_request_start(id, "shell", 0); - packet_send(); + channel_request(id, "shell", 0); } + /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */ + /* register different callback, etc. XXX */ packet_set_interactive(interactive); } -/* open new channel for a session */ -static int -ssh_session2_open(void) +int +ssh_session2_command(void) { - Channel *c; - int window, packetmax, in, out, err; + int id, window, packetmax; + int in, out, err; if (stdin_null_flag) { in = open(_PATH_DEVNULL, O_RDONLY); @@ -1149,74 +1061,50 @@ window = CHAN_SES_WINDOW_DEFAULT; packetmax = CHAN_SES_PACKET_DEFAULT; - if (tty_flag) { - window >>= 1; - packetmax >>= 1; + if (!tty_flag) { + window *= 2; + packetmax *=2; } - c = channel_new( + id = channel_new( "session", SSH_CHANNEL_OPENING, in, out, err, window, packetmax, CHAN_EXTENDED_WRITE, xstrdup("client-session"), /*nonblock*/0); - debug3("ssh_session2_open: channel_new: %d", c->self); +debug("channel_new: %d", id); - channel_send_open(c->self); - if (!no_shell_flag) - channel_register_confirm(c->self, ssh_session2_setup); + channel_open(id); + channel_register_callback(id, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION, + ssh_session2_callback, (void *)0); - return c->self; + return id; } -static int +int ssh_session2(void) { - int id = -1; + int id; /* XXX should be pre-session */ ssh_init_forwarding(); - if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) - id = ssh_session2_open(); + id = no_shell_flag ? -1 : ssh_session2_command(); /* If requested, let ssh continue in the background. */ if (fork_after_authentication_flag) if (daemon(1, 1) < 0) fatal("daemon() failed: %.200s", strerror(errno)); - return client_loop(tty_flag, tty_flag ? - options.escape_char : SSH_ESCAPECHAR_NONE, id); + return client_loop(tty_flag, tty_flag ? options.escape_char : -1, id); } -static void +void load_public_identity_files(void) { char *filename; - int i = 0; Key *public; -#ifdef SMARTCARD - Key **keys; + int i; - if (options.smartcard_device != NULL && - options.num_identity_files < SSH_MAX_IDENTITY_FILES && - (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) { - int count = 0; - for (i = 0; keys[i] != NULL; i++) { - count++; - memmove(&options.identity_files[1], &options.identity_files[0], - sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1)); - memmove(&options.identity_keys[1], &options.identity_keys[0], - sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); - options.num_identity_files++; - options.identity_keys[0] = keys[i]; - options.identity_files[0] = xstrdup("smartcard key");; - } - if (options.num_identity_files > SSH_MAX_IDENTITY_FILES) - options.num_identity_files = SSH_MAX_IDENTITY_FILES; - i = count; - xfree(keys); - } -#endif /* SMARTCARD */ - for (; i < options.num_identity_files; i++) { + for (i = 0; i < options.num_identity_files; i++) { filename = tilde_expand_filename(options.identity_files[i], original_real_uid); public = key_load_public(filename, NULL);