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 /auth2.c | |
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
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 56 |
1 files changed, 27 insertions, 29 deletions
@@ -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) { |