diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 05:01:22 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 05:01:22 +0000 |
commit | bba81213b972ce15fbbaca60b9ffabb42371ce8f (patch) | |
tree | e6bd40752969f2b93d179cfb9aaae9074ca45956 | |
parent | 34f91883a6f3123656b0a8017d68b658f7cf2403 (diff) |
- itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
readpass.c scp.c servconf.c serverloop.c session.c sftp.c
sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
ssh-keygen.c ssh-keyscan.c]
more strict prototypes. raise warning level in Makefile.inc.
markus ok'ed
TODO; cleanup headers
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | auth-rhosts.c | 4 | ||||
-rw-r--r-- | auth1.c | 6 | ||||
-rw-r--r-- | auth2-chall.c | 16 | ||||
-rw-r--r-- | auth2.c | 56 | ||||
-rw-r--r-- | authfd.c | 8 | ||||
-rw-r--r-- | authfile.c | 16 | ||||
-rw-r--r-- | canohost.c | 14 | ||||
-rw-r--r-- | channels.c | 74 | ||||
-rw-r--r-- | cipher.c | 63 | ||||
-rw-r--r-- | clientloop.c | 60 | ||||
-rw-r--r-- | deattack.c | 7 | ||||
-rw-r--r-- | dh.c | 4 | ||||
-rw-r--r-- | hostfile.c | 6 | ||||
-rw-r--r-- | kex.c | 33 | ||||
-rw-r--r-- | kexdh.c | 8 | ||||
-rw-r--r-- | kexgex.c | 8 | ||||
-rw-r--r-- | key.c | 16 | ||||
-rw-r--r-- | nchan.c | 14 | ||||
-rw-r--r-- | packet.c | 16 | ||||
-rw-r--r-- | radix.c | 4 | ||||
-rw-r--r-- | readpass.c | 4 | ||||
-rw-r--r-- | scp.c | 9 | ||||
-rw-r--r-- | servconf.c | 10 | ||||
-rw-r--r-- | serverloop.c | 46 | ||||
-rw-r--r-- | session.c | 69 | ||||
-rw-r--r-- | sftp-client.c | 18 | ||||
-rw-r--r-- | sftp-glob.c | 20 | ||||
-rw-r--r-- | sftp-int.c | 30 | ||||
-rw-r--r-- | sftp-server.c | 90 | ||||
-rw-r--r-- | sftp.c | 6 | ||||
-rw-r--r-- | ssh-add.c | 12 | ||||
-rw-r--r-- | ssh-agent.c | 42 | ||||
-rw-r--r-- | ssh-keygen.c | 24 | ||||
-rw-r--r-- | ssh-keyscan.c | 44 | ||||
-rw-r--r-- | ssh.c | 30 | ||||
-rw-r--r-- | sshconnect.c | 12 | ||||
-rw-r--r-- | sshconnect1.c | 20 | ||||
-rw-r--r-- | sshconnect2.c | 38 | ||||
-rw-r--r-- | sshd.c | 37 |
40 files changed, 510 insertions, 497 deletions
@@ -67,6 +67,17 @@ [ssh-keygen.c] try to decode ssh-3.0.0 private rsa keys (allow migration to openssh, not vice versa), #910 + - itojun@cvs.openbsd.org 2001/06/23 15:12:20 + [auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c + canohost.c channels.c cipher.c clientloop.c deattack.c dh.c + hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c + readpass.c scp.c servconf.c serverloop.c session.c sftp.c + sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c + ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c + ssh-keygen.c ssh-keyscan.c] + more strict prototypes. raise warning level in Makefile.inc. + markus ok'ed + TODO; cleanup headers 20010622 - (stevesk) handle systems without pw_expire and pw_change. @@ -5751,4 +5762,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1314 2001/06/25 04:47:54 mouring Exp $ +$Id: ChangeLog,v 1.1315 2001/06/25 05:01:22 mouring Exp $ diff --git a/auth-rhosts.c b/auth-rhosts.c index 324a0f92..9ba64dbc 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rhosts.c,v 1.23 2001/04/12 19:15:24 markus Exp $"); +RCSID("$OpenBSD: auth-rhosts.c,v 1.24 2001/06/23 15:12:17 itojun Exp $"); #include "packet.h" #include "xmalloc.h" @@ -34,7 +34,7 @@ extern ServerOptions options; * based on the file, and returns zero otherwise. */ -int +static int check_rhosts_file(const char *filename, const char *hostname, const char *ipaddr, const char *client_user, const char *server_user) @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.23 2001/05/18 14:13:28 markus Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.24 2001/06/23 15:12:17 itojun Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -35,7 +35,7 @@ extern char *aixloginmsg; /* * convert ssh auth msg type into description */ -char * +static char * get_authname(int type) { static char buf[1024]; @@ -64,7 +64,7 @@ get_authname(int type) * read packets, try to authenticate the user and * return only if authentication is successful */ -void +static void do_authloop(Authctxt *authctxt) { int authenticated = 0; diff --git a/auth2-chall.c b/auth2-chall.c index be741010..5afd7d76 100644 --- a/auth2-chall.c +++ b/auth2-chall.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: auth2-chall.c,v 1.6 2001/06/03 20:06:11 markus Exp $"); +RCSID("$OpenBSD: auth2-chall.c,v 1.7 2001/06/23 15:12:17 itojun Exp $"); #include "ssh2.h" #include "auth.h" @@ -33,9 +33,9 @@ RCSID("$OpenBSD: auth2-chall.c,v 1.6 2001/06/03 20:06:11 markus Exp $"); #include "auth.h" #include "log.h" -static int auth2_challenge_start(Authctxt *authctxt); -static int send_userauth_info_request(Authctxt *authctxt); -static void input_userauth_info_response(int type, int plen, void *ctxt); +static int auth2_challenge_start(Authctxt *); +static int send_userauth_info_request(Authctxt *); +static void input_userauth_info_response(int, int, void *); #ifdef BSD_AUTH extern KbdintDevice bsdauth_device; @@ -64,7 +64,7 @@ struct KbdintAuthctxt KbdintDevice *device; }; -KbdintAuthctxt * +static KbdintAuthctxt * kbdint_alloc(const char *devs) { KbdintAuthctxt *kbdintctxt; @@ -89,7 +89,7 @@ kbdint_alloc(const char *devs) return kbdintctxt; } -void +static void kbdint_reset_device(KbdintAuthctxt *kbdintctxt) { if (kbdintctxt->ctxt) { @@ -98,7 +98,7 @@ kbdint_reset_device(KbdintAuthctxt *kbdintctxt) } kbdintctxt->device = NULL; } -void +static void kbdint_free(KbdintAuthctxt *kbdintctxt) { if (kbdintctxt->device) @@ -110,7 +110,7 @@ kbdint_free(KbdintAuthctxt *kbdintctxt) xfree(kbdintctxt); } /* get next device */ -int +static int kbdint_next_device(KbdintAuthctxt *kbdintctxt) { size_t len; @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.65 2001/06/23 03:04:43 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.66 2001/06/23 15:12:17 itojun Exp $"); #include <openssl/evp.h> @@ -74,25 +74,23 @@ struct Authmethod { /* protocol */ -void input_service_request(int type, int plen, void *ctxt); -void input_userauth_request(int type, int plen, void *ctxt); -void protocol_error(int type, int plen, void *ctxt); +static void input_service_request(int, int, void *); +static void input_userauth_request(int, int, void *); +static void protocol_error(int, int, void *); /* helper */ -Authmethod *authmethod_lookup(const char *name); -char *authmethods_get(void); -int user_key_allowed(struct passwd *pw, Key *key); -int -hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, - Key *key); +static Authmethod *authmethod_lookup(const char *); +char *authmethods_get(void); +static int user_key_allowed(struct passwd *, Key *); +static int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); /* auth */ -void userauth_banner(void); -int userauth_none(Authctxt *authctxt); -int userauth_passwd(Authctxt *authctxt); -int userauth_pubkey(Authctxt *authctxt); -int userauth_hostbased(Authctxt *authctxt); -int userauth_kbdint(Authctxt *authctxt); +static void userauth_banner(void); +static int userauth_none(Authctxt *); +static int userauth_passwd(Authctxt *); +static int userauth_pubkey(Authctxt *); +static int userauth_hostbased(Authctxt *); +static int userauth_kbdint(Authctxt *); Authmethod authmethods[] = { {"none", @@ -136,7 +134,7 @@ do_authentication2() do_authenticated(authctxt); } -void +static void protocol_error(int type, int plen, void *ctxt) { log("auth: protocol error: type %d plen %d", type, plen); @@ -146,7 +144,7 @@ protocol_error(int type, int plen, void *ctxt) packet_write_wait(); } -void +static void input_service_request(int type, int plen, void *ctxt) { Authctxt *authctxt = ctxt; @@ -179,7 +177,7 @@ input_service_request(int type, int plen, void *ctxt) xfree(service); } -void +static void input_userauth_request(int type, int plen, void *ctxt) { Authctxt *authctxt = ctxt; @@ -297,7 +295,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) } } -void +static void userauth_banner(void) { struct stat st; @@ -328,7 +326,7 @@ done: return; } -int +static int userauth_none(Authctxt *authctxt) { /* disable method "none", only allowed one time */ @@ -354,7 +352,7 @@ userauth_none(Authctxt *authctxt) #endif /* USE_PAM */ } -int +static int userauth_passwd(Authctxt *authctxt) { char *password; @@ -383,7 +381,7 @@ userauth_passwd(Authctxt *authctxt) return authenticated; } -int +static int userauth_kbdint(Authctxt *authctxt) { int authenticated = 0; @@ -411,7 +409,7 @@ userauth_kbdint(Authctxt *authctxt) return authenticated; } -int +static int userauth_pubkey(Authctxt *authctxt) { Buffer b; @@ -517,7 +515,7 @@ userauth_pubkey(Authctxt *authctxt) return authenticated; } -int +static int userauth_hostbased(Authctxt *authctxt) { Buffer b; @@ -634,7 +632,7 @@ authmethods_get(void) return list; } -Authmethod * +static Authmethod * authmethod_lookup(const char *name) { Authmethod *method = NULL; @@ -649,7 +647,7 @@ authmethod_lookup(const char *name) } /* return 1 if user allows given key */ -int +static int user_key_allowed2(struct passwd *pw, Key *key, char *file) { char line[8192]; @@ -737,7 +735,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) } /* check whether given key is in .ssh/authorized_keys* */ -int +static int user_key_allowed(struct passwd *pw, Key *key) { int success; @@ -757,7 +755,7 @@ user_key_allowed(struct passwd *pw, Key *key) } /* return 1 if given hostkey is allowed */ -int +static int hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, Key *key) { @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.40 2001/06/07 20:23:03 markus Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.41 2001/06/23 15:12:17 itojun Exp $"); #include <openssl/evp.h> @@ -96,7 +96,7 @@ ssh_get_authentication_socket(void) return sock; } -int +static int ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply) { int l, len; @@ -419,7 +419,7 @@ ssh_agent_sign(AuthenticationConnection *auth, /* Encode key for a message to the agent. */ -void +static void ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment) { buffer_clear(b); @@ -435,7 +435,7 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment) buffer_put_cstring(b, comment); } -void +static void ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment) { buffer_clear(b); @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.36 2001/06/07 20:23:03 markus Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.37 2001/06/23 15:12:17 itojun Exp $"); #include <openssl/err.h> #include <openssl/evp.h> @@ -62,7 +62,7 @@ static const char authfile_id_string[] = * passphrase. */ -int +static int key_save_private_rsa1(Key *key, const char *filename, const char *passphrase, const char *comment) { @@ -159,7 +159,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase, } /* save SSH v2 key in OpenSSL PEM format */ -int +static int key_save_private_pem(Key *key, const char *filename, const char *_passphrase, const char *comment) { @@ -226,7 +226,7 @@ key_save_private(Key *key, const char *filename, const char *passphrase, * otherwise. */ -Key * +static Key * key_load_public_rsa1(int fd, const char *filename, char **commentp) { Buffer buffer; @@ -306,7 +306,7 @@ key_load_public_type(int type, const char *filename, char **commentp) * Assumes we are called under uid of the owner of the file. */ -Key * +static Key * key_load_private_rsa1(int fd, const char *filename, const char *passphrase, char **commentp) { @@ -430,7 +430,7 @@ fail: return NULL; } -Key * +static Key * key_load_private_pem(int fd, int type, const char *passphrase, char **commentp) { @@ -481,7 +481,7 @@ key_load_private_pem(int fd, int type, const char *passphrase, return prv; } -int +static int key_perm_ok(int fd, const char *filename) { struct stat st; @@ -571,7 +571,7 @@ key_load_private(const char *filename, const char *passphrase, return prv; } -int +static int key_try_load_public(Key *k, const char *filename, char **commentp) { FILE *f; @@ -12,21 +12,21 @@ */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.26 2001/04/18 14:15:00 markus Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.27 2001/06/23 15:12:17 itojun Exp $"); #include "packet.h" #include "xmalloc.h" #include "log.h" #include "canohost.h" -void check_ip_options(int socket, char *ipaddr); +static void check_ip_options(int, char *); /* * Return the canonical name of the host at the other end of the socket. The * caller should free the returned string with xfree. */ -char * +static char * get_remote_hostname(int socket, int reverse_mapping_check) { struct sockaddr_storage from; @@ -140,7 +140,7 @@ get_remote_hostname(int socket, int reverse_mapping_check) * exit here if we detect any IP options. */ /* IPv4 only */ -void +static void check_ip_options(int socket, char *ipaddr) { u_char options[200]; @@ -202,7 +202,7 @@ get_canonical_hostname(int reverse_mapping_check) * Returns the remote IP-address of socket as a string. The returned * string must be freed. */ -char * +static char * get_socket_address(int socket, int remote, int flags) { struct sockaddr_storage addr; @@ -293,7 +293,7 @@ get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check) /* Returns the local/remote port for the socket. */ -int +static int get_sock_port(int sock, int local) { struct sockaddr_storage from; @@ -323,7 +323,7 @@ get_sock_port(int sock, int local) /* Returns remote/local port number for the current connection. */ -int +static int get_port(int local) { /* @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.126 2001/06/20 13:56:39 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.127 2001/06/23 15:12:17 itojun Exp $"); #include "ssh.h" #include "ssh1.h" @@ -133,12 +133,11 @@ static u_int x11_fake_data_len; static char *auth_sock_name = NULL; static char *auth_sock_dir = NULL; - /* AF_UNSPEC or AF_INET or AF_INET6 */ extern int IPv4or6; /* helper */ -void port_open_helper(Channel *c, char *rtype); +static void port_open_helper(Channel *c, char *rtype); /* -- channel core */ @@ -164,7 +163,7 @@ channel_lookup(int id) * when the channel consumer/producer is ready, e.g. shell exec'd */ -void +static void channel_register_fds(Channel *c, int rfd, int wfd, int efd, int extusage, int nonblock) { @@ -270,7 +269,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, /* Close all channel fd/socket. */ -void +static void channel_close_fds(Channel *c) { debug3("channel_close_fds: channel %d: r %d w %d e %d", @@ -633,20 +632,20 @@ typedef void chan_fn(Channel *c, fd_set * readset, fd_set * writeset); chan_fn *channel_pre[SSH_CHANNEL_MAX_TYPE]; chan_fn *channel_post[SSH_CHANNEL_MAX_TYPE]; -void +static void channel_pre_listener(Channel *c, fd_set * readset, fd_set * writeset) { FD_SET(c->sock, readset); } -void +static void channel_pre_connecting(Channel *c, fd_set * readset, fd_set * writeset) { debug3("channel %d: waiting for connection", c->self); FD_SET(c->sock, writeset); } -void +static void channel_pre_open_13(Channel *c, fd_set * readset, fd_set * writeset) { if (buffer_len(&c->input) < packet_get_maxsize()) @@ -655,7 +654,7 @@ channel_pre_open_13(Channel *c, fd_set * readset, fd_set * writeset) FD_SET(c->sock, writeset); } -void +static void channel_pre_open_15(Channel *c, fd_set * readset, fd_set * writeset) { /* test whether sockets are 'alive' for read/write */ @@ -672,7 +671,7 @@ channel_pre_open_15(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_pre_open_20(Channel *c, fd_set * readset, fd_set * writeset) { if (c->istate == CHAN_INPUT_OPEN && @@ -698,7 +697,7 @@ channel_pre_open_20(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_pre_input_draining(Channel *c, fd_set * readset, fd_set * writeset) { if (buffer_len(&c->input) == 0) { @@ -710,7 +709,7 @@ channel_pre_input_draining(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_pre_output_draining(Channel *c, fd_set * readset, fd_set * writeset) { if (buffer_len(&c->output) == 0) @@ -728,7 +727,7 @@ channel_pre_output_draining(Channel *c, fd_set * readset, fd_set * writeset) * XXX All this happens at the client side. * Returns: 0 = need more data, -1 = wrong cookie, 1 = ok */ -int +static int x11_open_helper(Buffer *b) { u_char *ucp; @@ -786,7 +785,7 @@ x11_open_helper(Buffer *b) return 1; } -void +static void channel_pre_x11_open_13(Channel *c, fd_set * readset, fd_set * writeset) { int ret = x11_open_helper(&c->output); @@ -811,7 +810,7 @@ channel_pre_x11_open_13(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_pre_x11_open(Channel *c, fd_set * readset, fd_set * writeset) { int ret = x11_open_helper(&c->output); @@ -830,7 +829,7 @@ channel_pre_x11_open(Channel *c, fd_set * readset, fd_set * writeset) } /* try to decode a socks4 header */ -int +static int channel_decode_socks4(Channel *c, fd_set * readset, fd_set * writeset) { u_char *p, *host; @@ -900,7 +899,7 @@ channel_decode_socks4(Channel *c, fd_set * readset, fd_set * writeset) } /* dynamic port forwarding */ -void +static void channel_pre_dynamic(Channel *c, fd_set * readset, fd_set * writeset) { u_char *p; @@ -940,7 +939,7 @@ channel_pre_dynamic(Channel *c, fd_set * readset, fd_set * writeset) } /* This is our fake X11 server socket. */ -void +static void channel_post_x11_listener(Channel *c, fd_set * readset, fd_set * writeset) { Channel *nc; @@ -998,7 +997,7 @@ channel_post_x11_listener(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void port_open_helper(Channel *c, char *rtype) { int direct; @@ -1052,7 +1051,7 @@ port_open_helper(Channel *c, char *rtype) /* * This socket is listening for connections to a forwarded TCP/IP port. */ -void +static void channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset) { Channel *nc; @@ -1100,7 +1099,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset) * This is the authentication agent socket listening for connections from * clients. */ -void +static void channel_post_auth_listener(Channel *c, fd_set * readset, fd_set * writeset) { Channel *nc; @@ -1140,7 +1139,7 @@ channel_post_auth_listener(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset) { int err = 0; @@ -1187,7 +1186,7 @@ channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset) } } -int +static int channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset) { char buf[16*1024]; @@ -1225,7 +1224,7 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset) } return 1; } -int +static int channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset) { struct termios tio; @@ -1273,7 +1272,7 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset) } return 1; } -int +static int channel_handle_efd(Channel *c, fd_set * readset, fd_set * writeset) { char buf[16*1024]; @@ -1318,7 +1317,7 @@ channel_handle_efd(Channel *c, fd_set * readset, fd_set * writeset) } return 1; } -int +static int channel_check_window(Channel *c) { if (c->type == SSH_CHANNEL_OPEN && @@ -1338,14 +1337,14 @@ channel_check_window(Channel *c) return 1; } -void +static void channel_post_open_1(Channel *c, fd_set * readset, fd_set * writeset) { channel_handle_rfd(c, readset, writeset); channel_handle_wfd(c, readset, writeset); } -void +static void channel_post_open_2(Channel *c, fd_set * readset, fd_set * writeset) { channel_handle_rfd(c, readset, writeset); @@ -1355,7 +1354,7 @@ channel_post_open_2(Channel *c, fd_set * readset, fd_set * writeset) channel_check_window(c); } -void +static void channel_post_output_drain_13(Channel *c, fd_set * readset, fd_set * writeset) { int len; @@ -1370,7 +1369,7 @@ channel_post_output_drain_13(Channel *c, fd_set * readset, fd_set * writeset) } } -void +static void channel_handler_init_20(void) { channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_20; @@ -1391,7 +1390,7 @@ channel_handler_init_20(void) channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_2; } -void +static void channel_handler_init_13(void) { channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_13; @@ -1413,7 +1412,7 @@ channel_handler_init_13(void) channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_1; } -void +static void channel_handler_init_15(void) { channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_15; @@ -1432,7 +1431,7 @@ channel_handler_init_15(void) channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_1; } -void +static void channel_handler_init(void) { int i; @@ -1448,7 +1447,7 @@ channel_handler_init(void) channel_handler_init_15(); } -void +static void channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset) { static int did_init = 0; @@ -1828,7 +1827,7 @@ channel_input_open_confirmation(int type, int plen, void *ctxt) } } -char * +static char * reason2txt(int reason) { switch(reason) { @@ -2220,7 +2219,7 @@ channel_clear_permitted_opens(void) /* return socket to remote host, port */ -int +static int connect_to(const char *host, u_short port) { struct addrinfo hints, *ai, *aitop; @@ -2455,8 +2454,7 @@ x11_create_display_inet(int screen_number, int x11_display_offset) #define X_UNIX_PATH "/tmp/.X11-unix/X" #endif -static -int +static int connect_local_xsocket(u_int dnr) { static const char *const x_sockets[] = { @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.44 2001/05/28 22:51:10 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.45 200 |