diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-options.c | 4 | ||||
-rw-r--r-- | auth.h | 21 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | session.h | 3 | ||||
-rw-r--r-- | sshd.c | 6 |
6 files changed, 33 insertions, 11 deletions
@@ -86,6 +86,10 @@ | |||
86 | use xfree() after xstrdup(). | 86 | use xfree() after xstrdup(). |
87 | 87 | ||
88 | markus@ ok | 88 | markus@ ok |
89 | - markus@cvs.openbsd.org 2002/03/19 10:35:39 | ||
90 | [auth-options.c auth.h session.c session.h sshd.c] | ||
91 | clean up prototypes | ||
92 | |||
89 | 20020317 | 93 | 20020317 |
90 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, | 94 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, |
91 | warn if directory does not exist. Put system directories in front of | 95 | warn if directory does not exist. Put system directories in front of |
@@ -7931,4 +7935,4 @@ | |||
7931 | - Wrote replacements for strlcpy and mkdtemp | 7935 | - Wrote replacements for strlcpy and mkdtemp |
7932 | - Released 1.0pre1 | 7936 | - Released 1.0pre1 |
7933 | 7937 | ||
7934 | $Id: ChangeLog,v 1.1949 2002/03/22 02:47:28 mouring Exp $ | 7938 | $Id: ChangeLog,v 1.1950 2002/03/22 02:50:06 mouring Exp $ |
diff --git a/auth-options.c b/auth-options.c index 48be6d8e0..3408b3d8f 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.22 2002/03/18 17:50:31 provos Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.23 2002/03/19 10:35:39 markus Exp $"); |
14 | 14 | ||
15 | #include "packet.h" | 15 | #include "packet.h" |
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
@@ -42,7 +42,7 @@ struct envstring *custom_environment = NULL; | |||
42 | 42 | ||
43 | extern ServerOptions options; | 43 | extern ServerOptions options; |
44 | 44 | ||
45 | void | 45 | static void |
46 | auth_send_debug(Buffer *m) | 46 | auth_send_debug(Buffer *m) |
47 | { | 47 | { |
48 | char *msg; | 48 | char *msg; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.34 2002/03/18 17:50:31 provos Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.35 2002/03/19 10:35:39 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -88,7 +88,7 @@ struct KbdintDevice | |||
88 | void (*free_ctx)(void *ctx); | 88 | void (*free_ctx)(void *ctx); |
89 | }; | 89 | }; |
90 | 90 | ||
91 | int auth_rhosts(struct passwd *, const char *); | 91 | int auth_rhosts(struct passwd *, const char *); |
92 | int | 92 | int |
93 | auth_rhosts2(struct passwd *, const char *, const char *, const char *); | 93 | auth_rhosts2(struct passwd *, const char *, const char *, const char *); |
94 | 94 | ||
@@ -96,6 +96,13 @@ int auth_rhosts_rsa(struct passwd *, char *, Key *); | |||
96 | int auth_password(Authctxt *, const char *); | 96 | int auth_password(Authctxt *, const char *); |
97 | int auth_rsa(struct passwd *, BIGNUM *); | 97 | int auth_rsa(struct passwd *, BIGNUM *); |
98 | int auth_rsa_challenge_dialog(Key *); | 98 | int auth_rsa_challenge_dialog(Key *); |
99 | BIGNUM *auth_rsa_generate_challenge(Key *); | ||
100 | int auth_rsa_verify_response(Key *, BIGNUM *, u_char[]); | ||
101 | int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); | ||
102 | |||
103 | int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); | ||
104 | int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); | ||
105 | int user_key_allowed(struct passwd *, Key *); | ||
99 | 106 | ||
100 | #ifdef KRB4 | 107 | #ifdef KRB4 |
101 | #include <krb.h> | 108 | #include <krb.h> |
@@ -133,6 +140,10 @@ void privsep_challenge_enable(void); | |||
133 | 140 | ||
134 | int auth2_challenge(Authctxt *, char *); | 141 | int auth2_challenge(Authctxt *, char *); |
135 | void auth2_challenge_stop(Authctxt *); | 142 | void auth2_challenge_stop(Authctxt *); |
143 | int bsdauth_query(void *, char **, char **, u_int *, char ***, u_int **); | ||
144 | int bsdauth_respond(void *, u_int, char **); | ||
145 | int skey_query(void *, char **, char **, u_int *, char ***, u_int **); | ||
146 | int skey_respond(void *, u_int, char **); | ||
136 | 147 | ||
137 | int allowed_user(struct passwd *); | 148 | int allowed_user(struct passwd *); |
138 | struct passwd * getpwnamallow(const char *user); | 149 | struct passwd * getpwnamallow(const char *user); |
@@ -153,6 +164,12 @@ HostStatus | |||
153 | check_key_in_hostfiles(struct passwd *, Key *, const char *, | 164 | check_key_in_hostfiles(struct passwd *, Key *, const char *, |
154 | const char *, const char *); | 165 | const char *, const char *); |
155 | 166 | ||
167 | /* hostkey handling */ | ||
168 | Key *get_hostkey_by_index(int); | ||
169 | Key *get_hostkey_by_type(int); | ||
170 | int get_hostkey_index(Key *); | ||
171 | int ssh1_session_key(BIGNUM *); | ||
172 | |||
156 | #define AUTH_FAIL_MAX 6 | 173 | #define AUTH_FAIL_MAX 6 |
157 | #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2) | 174 | #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2) |
158 | #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" | 175 | #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.130 2002/03/18 17:50:31 provos Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.131 2002/03/19 10:35:39 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1114,7 +1114,7 @@ do_setusercontext(struct passwd *pw) | |||
1114 | fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); | 1114 | fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); |
1115 | } | 1115 | } |
1116 | 1116 | ||
1117 | void | 1117 | static void |
1118 | launch_login(struct passwd *pw, const char *hostname) | 1118 | launch_login(struct passwd *pw, const char *hostname) |
1119 | { | 1119 | { |
1120 | /* Launch login(1). */ | 1120 | /* Launch login(1). */ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.h,v 1.15 2002/03/18 17:50:31 provos Exp $ */ | 1 | /* $OpenBSD: session.h,v 1.16 2002/03/19 10:35:39 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -59,6 +59,7 @@ int session_input_channel_req(Channel *, const char *); | |||
59 | void session_close_by_pid(pid_t, int); | 59 | void session_close_by_pid(pid_t, int); |
60 | void session_close_by_channel(int, void *); | 60 | void session_close_by_channel(int, void *); |
61 | void session_destroy_all(void (*)(Session *)); | 61 | void session_destroy_all(void (*)(Session *)); |
62 | void session_pty_cleanup2(void *); | ||
62 | 63 | ||
63 | Session *session_new(void); | 64 | Session *session_new(void); |
64 | Session *session_by_tty(char *); | 65 | Session *session_by_tty(char *); |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.232 2002/03/19 03:03:43 stevesk Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.233 2002/03/19 10:35:39 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -516,7 +516,7 @@ demote_sensitive_data(void) | |||
516 | /* We do not clear ssh1_host key and cookie. XXX - Okay Niels? */ | 516 | /* We do not clear ssh1_host key and cookie. XXX - Okay Niels? */ |
517 | } | 517 | } |
518 | 518 | ||
519 | void | 519 | static void |
520 | privsep_preauth_child(void) | 520 | privsep_preauth_child(void) |
521 | { | 521 | { |
522 | u_int32_t rand[256]; | 522 | u_int32_t rand[256]; |
@@ -546,7 +546,7 @@ privsep_preauth_child(void) | |||
546 | setuid(options.unprivileged_user); | 546 | setuid(options.unprivileged_user); |
547 | } | 547 | } |
548 | 548 | ||
549 | void | 549 | static void |
550 | privsep_postauth(Authctxt *authctxt, pid_t pid) | 550 | privsep_postauth(Authctxt *authctxt, pid_t pid) |
551 | { | 551 | { |
552 | extern Authctxt *x_authctxt; | 552 | extern Authctxt *x_authctxt; |