summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-09 02:11:24 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-09 02:11:24 +0000
commit31ca54aa86a90052f8fe73fda66c7f39fd5079bc (patch)
tree91bf4097b9145323fd2aee645a2a42348e33b22e
parente9cf357a99dcd2db14635974289e04f5f0808123 (diff)
- itojun@cvs.openbsd.org 2001/02/08 19:30:52
sync with netbsd tree changes. - more strict prototypes, include necessary headers - use paths.h/pathnames.h decls - size_t typecase to int -> u_long
-rw-r--r--ChangeLog8
-rw-r--r--auth-rhosts.c5
-rw-r--r--authfile.c3
-rw-r--r--canohost.c3
-rw-r--r--cli.c13
-rw-r--r--clientloop.c28
-rw-r--r--compress.c3
-rw-r--r--hmac.c4
-rw-r--r--hostfile.h5
-rw-r--r--kex.c4
-rw-r--r--mpaux.c4
-rw-r--r--packet.c6
-rw-r--r--pty.c8
-rw-r--r--readpass.c3
-rw-r--r--scp.c6
-rw-r--r--serverloop.c18
-rw-r--r--session.c3
-rw-r--r--ssh-dss.c3
-rw-r--r--ssh-rsa.c3
-rw-r--r--ssh.c10
-rw-r--r--sshconnect.c6
-rw-r--r--sshconnect1.c10
-rw-r--r--sshd.c10
-rw-r--r--tildexpand.c3
-rw-r--r--uuencode.c4
25 files changed, 100 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a0dfbdf..fe8c4282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,12 @@
[clientloop.c]
remove confusing callback code
- (djm) Add CVS Id's to files that we have missed
+ - (bal) OpenBSD Sync (more):
+ - itojun@cvs.openbsd.org 2001/02/08 19:30:52
+ sync with netbsd tree changes.
+ - more strict prototypes, include necessary headers
+ - use paths.h/pathnames.h decls
+ - size_t typecase to int -> u_long
20010208
- (djm) Don't delete external askpass program in make uninstall target.
@@ -3678,4 +3684,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.704 2001/02/09 01:55:35 djm Exp $
+$Id: ChangeLog,v 1.705 2001/02/09 02:11:24 mouring Exp $
diff --git a/auth-rhosts.c b/auth-rhosts.c
index d8d10ffc..9b018c9d 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-rhosts.c,v 1.20 2001/02/03 10:08:36 markus Exp $");
+RCSID("$OpenBSD: auth-rhosts.c,v 1.21 2001/02/08 19:30:51 itojun Exp $");
#include "packet.h"
#include "xmalloc.h"
@@ -23,6 +23,7 @@ RCSID("$OpenBSD: auth-rhosts.c,v 1.20 2001/02/03 10:08:36 markus Exp $");
#include "log.h"
#include "servconf.h"
#include "canohost.h"
+#include "auth.h"
/*
* This function processes an rhosts-style file (.rhosts, .shosts, or
@@ -188,7 +189,7 @@ auth_rhosts(struct passwd *pw, const char *client_user)
/* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */
if (pw->pw_uid != 0) {
- if (check_rhosts_file("/etc/hosts.equiv", hostname, ipaddr, client_user,
+ if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user,
pw->pw_name)) {
packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.",
hostname, ipaddr);
diff --git a/authfile.c b/authfile.c
index 8d39e32e..aa898c72 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.26 2001/01/28 22:27:05 stevesk Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.27 2001/02/08 19:30:51 itojun Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
@@ -49,6 +49,7 @@ RCSID("$OpenBSD: authfile.c,v 1.26 2001/01/28 22:27:05 stevesk Exp $");
#include "key.h"
#include "ssh.h"
#include "log.h"
+#include "authfile.h"
/* Version identification string for identity files. */
static const char authfile_id_string[] =
diff --git a/canohost.c b/canohost.c
index 87f56054..8f4bebda 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,11 +12,12 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.20 2001/02/03 10:08:37 markus Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.21 2001/02/08 19:30:51 itojun Exp $");
#include "packet.h"
#include "xmalloc.h"
#include "log.h"
+#include "canohost.h"
void check_ip_options(int socket, char *ipaddr);
diff --git a/cli.c b/cli.c
index 67a718b7..6152a810 100644
--- a/cli.c
+++ b/cli.c
@@ -1,8 +1,9 @@
#include "includes.h"
-RCSID("$OpenBSD: cli.c,v 1.7 2001/02/04 15:32:23 stevesk Exp $");
+RCSID("$OpenBSD: cli.c,v 1.8 2001/02/08 19:30:51 itojun Exp $");
#include "xmalloc.h"
#include "log.h"
+#include "cli.h"
static int cli_input = -1;
static int cli_output = -1;
@@ -31,7 +32,7 @@ cli_open(int from_stdin)
cli_input = STDIN_FILENO;
cli_output = STDERR_FILENO;
} else {
- cli_input = cli_output = open("/dev/tty", O_RDWR);
+ cli_input = cli_output = open(_PATH_TTY, O_RDWR);
if (cli_input < 0)
fatal("You have no controlling tty. Cannot read passphrase.");
}
@@ -42,7 +43,7 @@ cli_open(int from_stdin)
}
static void
-cli_close()
+cli_close(void)
{
if (!cli_from_stdin && cli_input >= 0)
close(cli_input);
@@ -53,13 +54,13 @@ cli_close()
}
void
-intrcatch()
+intrcatch(int sig)
{
intr = 1;
}
static void
-cli_echo_disable()
+cli_echo_disable(void)
{
sigemptyset(&nset);
sigaddset(&nset, SIGTSTP);
@@ -82,7 +83,7 @@ cli_echo_disable()
}
static void
-cli_echo_restore()
+cli_echo_restore(void)
{
if (echo_modified != 0) {
tcsetattr(cli_input, TCSANOW, &otio);
diff --git a/clientloop.c b/clientloop.c
index d57b300d..e892c1ab 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.48 2001/02/06 22:43:02 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.49 2001/02/08 19:30:51 itojun Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -133,7 +133,7 @@ int session_ident = -1;
/* Returns the user\'s terminal to normal mode if it had been put in raw mode. */
void
-leave_raw_mode()
+leave_raw_mode(void)
{
if (!in_raw_mode)
return;
@@ -147,7 +147,7 @@ leave_raw_mode()
/* Puts the user\'s terminal in raw mode. */
void
-enter_raw_mode()
+enter_raw_mode(void)
{
struct termios tio;
@@ -173,7 +173,7 @@ enter_raw_mode()
/* Restores stdin to blocking mode. */
void
-leave_non_blocking()
+leave_non_blocking(void)
{
if (in_non_blocking_mode) {
(void) fcntl(fileno(stdin), F_SETFL, 0);
@@ -185,7 +185,7 @@ leave_non_blocking()
/* Puts stdin terminal in non-blocking mode. */
void
-enter_non_blocking()
+enter_non_blocking(void)
{
in_non_blocking_mode = 1;
(void) fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
@@ -227,7 +227,7 @@ signal_handler(int sig)
*/
double
-get_current_time()
+get_current_time(void)
{
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -241,7 +241,7 @@ get_current_time()
*/
void
-client_check_initial_eof_on_stdin()
+client_check_initial_eof_on_stdin(void)
{
int len;
char buf[1];
@@ -295,7 +295,7 @@ client_check_initial_eof_on_stdin()
*/
void
-client_make_packets_from_stdin_data()
+client_make_packets_from_stdin_data(void)
{
u_int len;
@@ -326,7 +326,7 @@ client_make_packets_from_stdin_data()
*/
void
-client_check_window_change()
+client_check_window_change(void)
{
struct winsize ws;
@@ -760,7 +760,7 @@ client_process_output(fd_set * writeset)
*/
void
-client_process_buffered_input_packets()
+client_process_buffered_input_packets(void)
{
dispatch_run(DISPATCH_NONBLOCK, &quit_pending, NULL);
}
@@ -1195,7 +1195,7 @@ client_input_channel_req(int type, int plen, void *ctxt)
}
void
-client_init_dispatch_20()
+client_init_dispatch_20(void)
{
dispatch_init(&dispatch_protocol_error);
dispatch_set(SSH2_MSG_CHANNEL_CLOSE, &channel_input_oclose);
@@ -1209,7 +1209,7 @@ client_init_dispatch_20()
dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust);
}
void
-client_init_dispatch_13()
+client_init_dispatch_13(void)
{
dispatch_init(NULL);
dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_close);
@@ -1228,14 +1228,14 @@ client_init_dispatch_13()
&x11_input_open : &deny_input_open);
}
void
-client_init_dispatch_15()
+client_init_dispatch_15(void)
{
client_init_dispatch_13();
dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_ieof);
dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, & channel_input_oclose);
}
void
-client_init_dispatch()
+client_init_dispatch(void)
{
if (compat20)
client_init_dispatch_20();
diff --git a/compress.c b/compress.c
index 1871bc8c..e8539baf 100644
--- a/compress.c
+++ b/compress.c
@@ -12,11 +12,12 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.12 2001/01/21 19:05:48 markus Exp $");
+RCSID("$OpenBSD: compress.c,v 1.13 2001/02/08 19:30:51 itojun Exp $");
#include "log.h"
#include "buffer.h"
#include "zlib.h"
+#include "compress.h"
static z_stream incoming_stream;
static z_stream outgoing_stream;
diff --git a/hmac.c b/hmac.c
index e440d611..831dd243 100644
--- a/hmac.c
+++ b/hmac.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: hmac.c,v 1.6 2001/01/21 19:05:49 markus Exp $");
+RCSID("$OpenBSD: hmac.c,v 1.7 2001/02/08 19:30:51 itojun Exp $");
#include "xmalloc.h"
#include "getput.h"
@@ -31,6 +31,8 @@ RCSID("$OpenBSD: hmac.c,v 1.6 2001/01/21 19:05:49 markus Exp $");
#include <openssl/hmac.h>
+#include "hmac.h"
+
u_char *
hmac(
EVP_MD *evp_md,
diff --git a/hostfile.h b/hostfile.h
index e1f5d164..346bcd9b 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.h,v 1.6 2001/01/29 01:58:16 niklas Exp $ */
+/* $OpenBSD: hostfile.h,v 1.7 2001/02/08 19:30:51 itojun Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -14,6 +14,9 @@
#ifndef HOSTFILE_H
#define HOSTFILE_H
+int
+auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n);
+
/*
* Checks whether the given host is already in the list of our known hosts.
* Returns HOST_OK if the host is known and has the specified key, HOST_NEW
diff --git a/kex.c b/kex.c
index 754ced8e..7c1326ed 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.19 2001/02/04 15:32:23 stevesk Exp $");
+RCSID("$OpenBSD: kex.c,v 1.20 2001/02/08 19:30:51 itojun Exp $");
#include <openssl/crypto.h>
#include <openssl/bio.h>
@@ -200,6 +200,7 @@ dh_new_group1(void)
return (dh_new_group_asc(gen, group1));
}
+#ifdef DEBUG_KEX
void
dump_digest(u_char *digest, int len)
{
@@ -211,6 +212,7 @@ dump_digest(u_char *digest, int len)
}
fprintf(stderr, "\n");
}
+#endif
u_char *
kex_hash(
diff --git a/mpaux.c b/mpaux.c
index 6b586ec0..0c486275 100644
--- a/mpaux.c
+++ b/mpaux.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: mpaux.c,v 1.15 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: mpaux.c,v 1.16 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/bn.h>
#include "getput.h"
@@ -21,6 +21,8 @@ RCSID("$OpenBSD: mpaux.c,v 1.15 2000/12/19 23:17:57 markus Exp $");
#include <openssl/md5.h>
+#include "mpaux.h"
+
void
compute_session_id(u_char session_id[16],
u_char cookie[8],
diff --git a/packet.c b/packet.c
index 5a024fa9..956e711e 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.48 2001/02/04 15:32:24 stevesk Exp $");
+RCSID("$OpenBSD: packet.c,v 1.49 2001/02/08 19:30:52 itojun Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -455,7 +455,7 @@ packet_put_bignum2(BIGNUM * value)
*/
void
-packet_send1()
+packet_send1(void)
{
char buf[8], *cp;
int i, padding, len;
@@ -529,7 +529,7 @@ packet_send1()
* Finalize packet in SSH2 format (compress, mac, encrypt, enqueue)
*/
void
-packet_send2()
+packet_send2(void)
{
u_char *macbuf = NULL;
char *cp;
diff --git a/pty.c b/pty.c
index 83b219b9..e71bceb8 100644
--- a/pty.c
+++ b/pty.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: pty.c,v 1.20 2001/01/21 19:05:53 markus Exp $");
+RCSID("$OpenBSD: pty.c,v 1.22 2001/02/08 19:30:52 itojun Exp $");
#ifdef HAVE_UTIL_H
# include <util.h>
@@ -217,7 +217,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
/* First disconnect from the old controlling tty. */
#ifdef TIOCNOTTY
- fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+ fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
if (fd >= 0) {
(void) ioctl(fd, TIOCNOTTY, NULL);
close(fd);
@@ -230,7 +230,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
* Verify that we are successfully disconnected from the controlling
* tty.
*/
- fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+ fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
if (fd >= 0) {
error("Failed to disconnect from controlling tty.");
close(fd);
@@ -262,7 +262,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
#endif /* USE_VHANGUP */
}
/* Verify that we now have a controlling tty. */
- fd = open("/dev/tty", O_WRONLY);
+ fd = open(_PATH_TTY, O_WRONLY);
if (fd < 0)
error("open /dev/tty failed - could not set controlling tty: %.100s",
strerror(errno));
diff --git a/readpass.c b/readpass.c
index fe158d54..3d73af74 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,10 +32,11 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.13 2001/01/21 19:05:54 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.14 2001/02/08 19:30:52 itojun Exp $");
#include "xmalloc.h"
#include "cli.h"
+#include "readpass.h"
/*
* Reads a passphrase from /dev/tty with echo turned off. Returns the
diff --git a/scp.c b/scp.c
index 14d8a8af..0095d6ff 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.55 2001/02/08 14:38:54 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.56 2001/02/08 19:30:52 itojun Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -219,11 +219,13 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory;
#define CMDNEEDS 64
char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */
+int main(int, char *[]);
int response(void);
void rsource(char *, struct stat *);
void sink(int, char *[]);
void source(int, char *[]);
void tolocal(int, char *[]);
+char *cleanhostname(char *);
void toremote(char *, int, char *[]);
void usage(void);
@@ -1110,7 +1112,7 @@ updateprogressmeter(int ignore)
}
int
-foregroundproc()
+foregroundproc(void)
{
static pid_t pgrp = -1;
int ctty_pgrp;
diff --git a/serverloop.c b/serverloop.c
index 024c54bc..c8187ab2 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.45 2001/02/04 15:32:25 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.46 2001/02/08 19:30:52 itojun Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -119,7 +119,7 @@ sigchld_handler2(int sig)
* to the client.
*/
void
-make_packets_from_stderr_data()
+make_packets_from_stderr_data(void)
{
int len;
@@ -148,7 +148,7 @@ make_packets_from_stderr_data()
* client.
*/
void
-make_packets_from_stdout_data()
+make_packets_from_stdout_data(void)
{
int len;
@@ -352,7 +352,7 @@ process_output(fd_set * writeset)
* This is used when the program terminates.
*/
void
-drain_output()
+drain_output(void)
{
/* Send any buffered stdout data to the client. */
if (buffer_len(&stdout_buffer) > 0) {
@@ -377,7 +377,7 @@ drain_output()
}
void
-process_buffered_input_packets()
+process_buffered_input_packets(void)
{
dispatch_run(DISPATCH_NONBLOCK, NULL, NULL);
}
@@ -882,7 +882,7 @@ server_input_global_request(int type, int plen, void *ctxt)
}
void
-server_init_dispatch_20()
+server_init_dispatch_20(void)
{
debug("server_init_dispatch_20");
dispatch_init(&dispatch_protocol_error);
@@ -898,7 +898,7 @@ server_init_dispatch_20()
dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request);
}
void
-server_init_dispatch_13()
+server_init_dispatch_13(void)
{
debug("server_init_dispatch_13");
dispatch_init(NULL);
@@ -913,7 +913,7 @@ server_init_dispatch_13()
dispatch_set(SSH_MSG_PORT_OPEN, &channel_input_port_open);
}
void
-server_init_dispatch_15()
+server_init_dispatch_15(void)
{
server_init_dispatch_13();
debug("server_init_dispatch_15");
@@ -921,7 +921,7 @@ server_init_dispatch_15()
dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, &channel_input_oclose);
}
void
-server_init_dispatch()
+server_init_dispatch(void)
{
if (compat20)
server_init_dispatch_20();
diff --git a/session.c b/session.c
index dcbf70f3..92fb31e0 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.52 2001/02/03 10:08:37 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.55 2001/02/08 19:30:52 itojun Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -56,6 +56,7 @@ RCSID("$OpenBSD: session.c,v 1.52 2001/02/03 10:08:37 markus Exp $");
#include "login.h"
#include "serverloop.h"
#include "canohost.h"
+#include "session.h"
#ifdef WITH_IRIX_PROJECT
#include <proj.h>
diff --git a/ssh-dss.c b/ssh-dss.c
index 11513e67..adc8f983 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.5 2001/02/04 15:32:25 stevesk Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.6 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/bn.h>
#include <openssl/evp.h>
@@ -34,6 +34,7 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.5 2001/02/04 15:32:25 stevesk Exp $");
#include "compat.h"
#include "log.h"
#include "key.h"
+#include "ssh-dss.h"
#define INTBLOB_LEN 20
#define SIGBLOB_LEN (2*INTBLOB_LEN)
diff --git a/ssh-rsa.c b/ssh-rsa.c
index 2dc34106..9de0e7b0 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-rsa.c,v 1.5 2001/01/21 19:05:58 markus Exp $");
+RCSID("$OpenBSD: ssh-rsa.c,v 1.6 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -33,6 +33,7 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.5 2001/01/21 19:05:58 markus Exp $");
#include "buffer.h"
#include "bufaux.h"
#include "key.h"
+#include "ssh-rsa.h"
/* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
int
diff --git a/ssh.c b/ssh.c
index 730ff382..1d758233 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.88 2001/02/04 15:32:26 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.93 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -145,12 +145,12 @@ int subsystem_flag = 0;
/* Prints a help message to the user. This function never returns. */
void
-usage()
+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 /dev/null.\n");
+ fprintf(stderr, " -n Redirect input from " _PATH_DEVNULL ".\n");
fprintf(stderr, " -A Enable authentication agent forwarding.\n");
fprintf(stderr, " -a Disable authentication agent forwarding.\n");
#ifdef AFS
@@ -724,7 +724,7 @@ x11_get_proto(char *proto, int proto_len, char *data, int data_len)
if (options.xauth_location) {
/* Try to get Xauthority information for the display. */
- snprintf(line, sizeof line, "%.100s list %.200s 2>/dev/null",
+ 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) &&
@@ -1019,7 +1019,7 @@ ssh_session2(void)
int in, out, err;
if (stdin_null_flag) {
- in = open("/dev/null", O_RDONLY);
+ in = open(_PATH_DEVNULL, O_RDONLY);
} else {
in = dup(STDIN_FILENO);
}
diff --git a/sshconnect.c b/sshconnect.c
index d9683b3f..10f52a07 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.93 2001/02/04 15:32:26 stevesk Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.95 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/bn.h>
@@ -322,7 +322,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
* identification string.
*/
void
-ssh_exchange_identification()
+ssh_exchange_identification(void)
{
char buf[256], remote_version[256]; /* must be same size! */
int remote_major, remote_minor, i, mismatch;
@@ -431,7 +431,7 @@ read_yes_or_no(const char *prompt, int defval)
if (isatty(STDIN_FILENO))
f = stdin;
else
- f = fopen("/dev/tty", "rw");
+ f = fopen(_PATH_TTY, "rw");
if (f == NULL)
return 0;
diff --git a/sshconnect1.c b/sshconnect1.c
index 80b769b4..c33ac503 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.22 2001/02/03 10:08:37 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.24 2001/02/08 19:30:52 itojun Exp $");
#include <openssl/bn.h>
#include <openssl/evp.h>
@@ -56,7 +56,7 @@ extern char *__progname;
* authenticate using the agent.
*/
int
-try_agent_authentication()
+try_agent_authentication(void)
{
int type;
char *comment;
@@ -380,7 +380,7 @@ try_rhosts_rsa_authentication(const char *local_user, RSA * host_key)
#ifdef KRB4
int
-try_kerberos_authentication()
+try_kerberos_authentication(void)
{
KTEXT_ST auth; /* Kerberos data */
char *reply;
@@ -497,7 +497,7 @@ try_kerberos_authentication()
#ifdef AFS
int
-send_kerberos_tgt()
+send_kerberos_tgt(void)
{
CREDENTIALS *creds;
char pname[ANAME_SZ], pinst[INST_SZ], prealm[REALM_SZ];
@@ -616,7 +616,7 @@ send_afs_tokens(void)
* Note that the client code is not tied to s/key or TIS.
*/
int
-try_challenge_reponse_authentication()
+try_challenge_reponse_authentication(void)
{
int type, i;
int payload_len;
diff --git a/sshd.c b/sshd.c
index e3291129..22eabcda 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.165 2001/02/08 19:30:53 itojun Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -211,7 +211,7 @@ sighup_handler(int sig)
* Restarts the server.
*/
void
-sighup_restart()
+sighup_restart(void)
{
log("Received SIGHUP; restarting.");
close_listen_socks();
@@ -774,7 +774,7 @@ main(int ac, char **av)
/* Disconnect from the controlling tty. */
#ifdef TIOCNOTTY
- fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+ fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
if (fd >= 0) {
(void) ioctl(fd, TIOCNOTTY, NULL);
close(fd);
@@ -1347,8 +1347,8 @@ do_ssh1_kex(void)
len = BN_num_bytes(session_key_int);
if (len < 0 || len > sizeof(session_key)) {
error("do_connection: bad session key len from %s: "
- "session_key_int %d > sizeof(session_key) %d",
- get_remote_ipaddr(), len, (int)sizeof(session_key));
+ "session_key_int %d > sizeof(session_key) %lu",
+ get_remote_ipaddr(), len, (u_long)sizeof(session_key));
rsafail++;
} else {
memset(session_key, 0, sizeof(session_key));
diff --git a/tildexpand.c b/tildexpand.c
index b7274468..46bdaae8 100644
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -11,10 +11,11 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: tildexpand.c,v 1.10 2001/01/21 19:06:01 markus Exp $");
+RCSID("$OpenBSD: tildexpand.c,v 1.11 2001/02/08 19:30:53 itojun Exp $");
#include "xmalloc.h"
#include "log.h"
+#include "tildexpand.h"
/*
* Expands tildes in the file name. Returns data allocated by xmalloc.
diff --git a/uuencode.c b/uuencode.c
index 01b84576..d5f2b96b 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.8 2000/12/19 23:17:59 markus Exp $ */
+/* $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -27,7 +27,7 @@
#include "includes.h"
#include "xmalloc.h"
-RCSID("$OpenBSD: uuencode.c,v 1.8 2000/12/19 23:17:59 markus Exp $");
+RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $");
int
uuencode(u_char *src, u_int srclength,