diff options
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r-- | usr.bin/ssh/authfd.c | 6 | ||||
-rw-r--r-- | usr.bin/ssh/authfd.h | 6 | ||||
-rw-r--r-- | usr.bin/ssh/compress.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/compress.h | 4 | ||||
-rw-r--r-- | usr.bin/ssh/kex.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/kex.h | 4 | ||||
-rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 | ||||
-rw-r--r-- | usr.bin/ssh/sshd.c | 10 | ||||
-rw-r--r-- | usr.bin/ssh/uidswap.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/uidswap.h | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index 7cc9dddcab2..7fa9080ca48 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/authfd.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.31 2000/12/19 23:17:55 markus Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.32 2000/12/20 19:37:21 markus Exp $"); #include "ssh.h" #include "rsa.h" @@ -62,7 +62,7 @@ int decode_reply(int type); /* Returns the number of the authentication fd, or -1 if there is none. */ int -ssh_get_authentication_socket() +ssh_get_authentication_socket(void) { const char *authsocket; int sock, len; @@ -167,7 +167,7 @@ ssh_close_authentication_socket(int sock) */ AuthenticationConnection * -ssh_get_authentication_connection() +ssh_get_authentication_connection(void) { AuthenticationConnection *auth; int sock; diff --git a/usr.bin/ssh/authfd.h b/usr.bin/ssh/authfd.h index 2900b6c4854..29d1847b5ee 100644 --- a/usr.bin/ssh/authfd.h +++ b/usr.bin/ssh/authfd.h @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: authfd.h,v 1.15 2000/12/19 23:17:55 markus Exp $"); */ +/* RCSID("$OpenBSD: authfd.h,v 1.16 2000/12/20 19:37:21 markus Exp $"); */ #ifndef AUTHFD_H #define AUTHFD_H @@ -51,7 +51,7 @@ typedef struct { } AuthenticationConnection; /* Returns the number of the authentication fd, or -1 if there is none. */ -int ssh_get_authentication_socket(); +int ssh_get_authentication_socket(void); /* * This should be called for any descriptor returned by @@ -66,7 +66,7 @@ void ssh_close_authentication_socket(int authfd); * connection could not be opened. The connection should be closed by the * caller by calling ssh_close_authentication_connection(). */ -AuthenticationConnection *ssh_get_authentication_connection(); +AuthenticationConnection *ssh_get_authentication_connection(void); /* * Closes the connection to the authentication agent and frees any associated diff --git a/usr.bin/ssh/compress.c b/usr.bin/ssh/compress.c index 3c05886e10a..2437606b7ab 100644 --- a/usr.bin/ssh/compress.c +++ b/usr.bin/ssh/compress.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: compress.c,v 1.10 2000/12/19 23:17:56 markus Exp $"); +RCSID("$OpenBSD: compress.c,v 1.11 2000/12/20 19:37:21 markus Exp $"); #include "ssh.h" #include "buffer.h" @@ -39,7 +39,7 @@ buffer_compress_init(int level) /* Frees any data structures allocated for compression. */ void -buffer_compress_uninit() +buffer_compress_uninit(void) { debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", outgoing_stream.total_in, outgoing_stream.total_out, diff --git a/usr.bin/ssh/compress.h b/usr.bin/ssh/compress.h index 5757164814b..87d592fe907 100644 --- a/usr.bin/ssh/compress.h +++ b/usr.bin/ssh/compress.h @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: compress.h,v 1.6 2000/09/07 20:27:50 deraadt Exp $"); */ +/* RCSID("$OpenBSD: compress.h,v 1.7 2000/12/20 19:37:22 markus Exp $"); */ #ifndef COMPRESS_H #define COMPRESS_H @@ -23,7 +23,7 @@ void buffer_compress_init(int level); /* Frees any data structures allocated by buffer_compress_init. */ -void buffer_compress_uninit(); +void buffer_compress_uninit(void); /* * Compresses the contents of input_buffer into output_buffer. All packets diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c index 015dae66839..de315705e14 100644 --- a/usr.bin/ssh/kex.c +++ b/usr.bin/ssh/kex.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kex.c,v 1.15 2000/12/19 23:17:56 markus Exp $"); +RCSID("$OpenBSD: kex.c,v 1.16 2000/12/20 19:37:22 markus Exp $"); #include "ssh.h" #include "ssh2.h" @@ -190,7 +190,7 @@ dh_new_group(BIGNUM *gen, BIGNUM *modulus) } DH * -dh_new_group1() +dh_new_group1(void) { static char *gen = "2", *group1 = "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1" diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h index cfa3a9c82ba..143769a31a0 100644 --- a/usr.bin/ssh/kex.h +++ b/usr.bin/ssh/kex.h @@ -102,8 +102,8 @@ void packet_set_kex(Kex *k); int dh_pub_is_valid(DH *dh, BIGNUM *dh_pub); DH *dh_new_group_asc(const char *, const char *); DH *dh_new_group(BIGNUM *, BIGNUM *); -void dh_gen_key(); -DH *dh_new_group1(); +void dh_gen_key(DH *); +DH *dh_new_group1(void); u_char * kex_hash( diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index d98f6be1e18..aee547fbee6 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.32 2000/12/19 23:17:58 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.33 2000/12/20 19:37:22 markus Exp $"); #include <openssl/bn.h> #include <openssl/rsa.h> @@ -475,7 +475,7 @@ int userauth_pubkey(Authctxt *authctxt); int userauth_passwd(Authctxt *authctxt); int userauth_kbdint(Authctxt *authctxt); -void authmethod_clear(); +void authmethod_clear(void); Authmethod *authmethod_get(char *authlist); Authmethod *authmethod_lookup(const char *name); @@ -933,7 +933,7 @@ static char *authlist_state = NULL; /* state variable for strtok_r() */ * finished processing server list to free resources. */ void -authmethod_clear() +authmethod_clear(void) { if (authlist_current != NULL) { xfree(authlist_current); diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 553bcca1d32..8d1ee0834f8 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.141 2000/12/20 19:32:08 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.142 2000/12/20 19:37:22 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -163,8 +163,8 @@ int session_id2_len = 0; u_int utmp_len = MAXHOSTNAMELEN; /* Prototypes for various functions defined later in this file. */ -void do_ssh1_kex(); -void do_ssh2_kex(); +void do_ssh1_kex(void); +void do_ssh2_kex(void); void ssh_dh1_server(Kex *, Buffer *_kexinit, Buffer *); void ssh_dhgex_server(Kex *, Buffer *_kexinit, Buffer *); @@ -1150,7 +1150,7 @@ main(int ac, char **av) * SSH1 key exchange */ void -do_ssh1_kex() +do_ssh1_kex(void) { int i, len; int plen, slen; @@ -1341,7 +1341,7 @@ do_ssh1_kex() * SSH2 key exchange: diffie-hellman-group1-sha1 */ void -do_ssh2_kex() +do_ssh2_kex(void) { Buffer *server_kexinit; Buffer *client_kexinit; diff --git a/usr.bin/ssh/uidswap.c b/usr.bin/ssh/uidswap.c index cb646726faf..cb213aa9131 100644 --- a/usr.bin/ssh/uidswap.c +++ b/usr.bin/ssh/uidswap.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: uidswap.c,v 1.10 2000/12/17 09:33:40 markus Exp $"); +RCSID("$OpenBSD: uidswap.c,v 1.11 2000/12/20 19:37:22 markus Exp $"); #include "ssh.h" #include "uidswap.h" @@ -64,7 +64,7 @@ temporarily_use_uid(uid_t uid) * Restores to the original uid. */ void -restore_uid() +restore_uid(void) { #ifdef SAVED_IDS_WORK_WITH_SETEUID /* Set the effective uid back to the saved uid. */ diff --git a/usr.bin/ssh/uidswap.h b/usr.bin/ssh/uidswap.h index ff6fad4c1f4..72f17d0dca5 100644 --- a/usr.bin/ssh/uidswap.h +++ b/usr.bin/ssh/uidswap.h @@ -23,7 +23,7 @@ void temporarily_use_uid(uid_t uid); * Restores the original effective user id after temporarily_use_uid(). * This should only be called while temporarily_use_uid is effective. */ -void restore_uid(); +void restore_uid(void); /* * Permanently sets all uids to the given uid. This cannot be called while |