diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth-bsdauth.c | 4 | ||||
-rw-r--r-- | auth-skey.c | 4 | ||||
-rw-r--r-- | auth2-chall.c | 4 | ||||
-rw-r--r-- | clientloop.c | 8 | ||||
-rw-r--r-- | key.c | 14 | ||||
-rw-r--r-- | monitor_wrap.c | 6 | ||||
-rw-r--r-- | monitor_wrap.h | 4 | ||||
-rw-r--r-- | scard.h | 6 | ||||
-rw-r--r-- | session.h | 4 | ||||
-rw-r--r-- | sftp-glob.c | 10 | ||||
-rw-r--r-- | ssh.c | 7 | ||||
-rw-r--r-- | sshconnect2.c | 4 | ||||
-rw-r--r-- | sshd.c | 9 |
14 files changed, 49 insertions, 42 deletions
@@ -33,6 +33,11 @@ | |||
33 | - deraadt@cvs.openbsd.org 2002/06/30 21:54:16 | 33 | - deraadt@cvs.openbsd.org 2002/06/30 21:54:16 |
34 | [auth2.c session.c sshd.c] | 34 | [auth2.c session.c sshd.c] |
35 | lint asks that we use names that do not overlap | 35 | lint asks that we use names that do not overlap |
36 | - deraadt@cvs.openbsd.org 2002/06/30 21:59:45 | ||
37 | [auth-bsdauth.c auth-skey.c auth2-chall.c clientloop.c key.c | ||
38 | monitor_wrap.c monitor_wrap.h scard.h session.h sftp-glob.c ssh.c | ||
39 | sshconnect2.c sshd.c] | ||
40 | minor KNF | ||
36 | 41 | ||
37 | 20020702 | 42 | 20020702 |
38 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & | 43 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & |
@@ -1241,4 +1246,4 @@ | |||
1241 | - (stevesk) entropy.c: typo in debug message | 1246 | - (stevesk) entropy.c: typo in debug message |
1242 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1247 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1243 | 1248 | ||
1244 | $Id: ChangeLog,v 1.2324 2002/07/04 00:12:53 mouring Exp $ | 1249 | $Id: ChangeLog,v 1.2325 2002/07/04 00:14:17 mouring Exp $ |
diff --git a/auth-bsdauth.c b/auth-bsdauth.c index 4f1b452b7..2ac27a7a2 100644 --- a/auth-bsdauth.c +++ b/auth-bsdauth.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: auth-bsdauth.c,v 1.4 2002/06/19 00:27:55 deraadt Exp $"); | 25 | RCSID("$OpenBSD: auth-bsdauth.c,v 1.5 2002/06/30 21:59:45 deraadt Exp $"); |
26 | 26 | ||
27 | #ifdef BSD_AUTH | 27 | #ifdef BSD_AUTH |
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
@@ -69,7 +69,7 @@ bsdauth_query(void *ctx, char **name, char **infotxt, | |||
69 | *name = xstrdup(""); | 69 | *name = xstrdup(""); |
70 | *infotxt = xstrdup(""); | 70 | *infotxt = xstrdup(""); |
71 | *numprompts = 1; | 71 | *numprompts = 1; |
72 | *prompts = xmalloc(*numprompts * sizeof(char*)); | 72 | *prompts = xmalloc(*numprompts * sizeof(char *)); |
73 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); | 73 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); |
74 | (*echo_on)[0] = 0; | 74 | (*echo_on)[0] = 0; |
75 | (*prompts)[0] = xstrdup(challenge); | 75 | (*prompts)[0] = xstrdup(challenge); |
diff --git a/auth-skey.c b/auth-skey.c index eb13c5cc5..f9ea03fd1 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: auth-skey.c,v 1.19 2002/06/19 00:27:55 deraadt Exp $"); | 25 | RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $"); |
26 | 26 | ||
27 | #ifdef SKEY | 27 | #ifdef SKEY |
28 | 28 | ||
@@ -53,7 +53,7 @@ skey_query(void *ctx, char **name, char **infotxt, | |||
53 | *name = xstrdup(""); | 53 | *name = xstrdup(""); |
54 | *infotxt = xstrdup(""); | 54 | *infotxt = xstrdup(""); |
55 | *numprompts = 1; | 55 | *numprompts = 1; |
56 | *prompts = xmalloc(*numprompts * sizeof(char*)); | 56 | *prompts = xmalloc(*numprompts * sizeof(char *)); |
57 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); | 57 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); |
58 | (*echo_on)[0] = 0; | 58 | (*echo_on)[0] = 0; |
59 | 59 | ||
diff --git a/auth2-chall.c b/auth2-chall.c index e1440f47d..0d1709307 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-chall.c,v 1.19 2002/06/26 13:55:37 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-chall.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
@@ -263,7 +263,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) | |||
263 | if (nresp > 100) | 263 | if (nresp > 100) |
264 | fatal("input_userauth_info_response: too many replies"); | 264 | fatal("input_userauth_info_response: too many replies"); |
265 | if (nresp > 0) { | 265 | if (nresp > 0) { |
266 | response = xmalloc(nresp * sizeof(char*)); | 266 | response = xmalloc(nresp * sizeof(char *)); |
267 | for (i = 0; i < nresp; i++) | 267 | for (i = 0; i < nresp; i++) |
268 | response[i] = packet_get_string(NULL); | 268 | response[i] = packet_get_string(NULL); |
269 | } | 269 | } |
diff --git a/clientloop.c b/clientloop.c index cd2eab77a..a3950ab68 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.102 2002/06/24 14:33:27 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.103 2002/06/30 21:59:45 deraadt Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1114,7 +1114,7 @@ client_input_exit_status(int type, u_int32_t seq, void *ctxt) | |||
1114 | static Channel * | 1114 | static Channel * |
1115 | client_request_forwarded_tcpip(const char *request_type, int rchan) | 1115 | client_request_forwarded_tcpip(const char *request_type, int rchan) |
1116 | { | 1116 | { |
1117 | Channel* c = NULL; | 1117 | Channel *c = NULL; |
1118 | char *listen_address, *originator_address; | 1118 | char *listen_address, *originator_address; |
1119 | int listen_port, originator_port; | 1119 | int listen_port, originator_port; |
1120 | int sock; | 1120 | int sock; |
@@ -1144,7 +1144,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1144 | return c; | 1144 | return c; |
1145 | } | 1145 | } |
1146 | 1146 | ||
1147 | static Channel* | 1147 | static Channel * |
1148 | client_request_x11(const char *request_type, int rchan) | 1148 | client_request_x11(const char *request_type, int rchan) |
1149 | { | 1149 | { |
1150 | Channel *c = NULL; | 1150 | Channel *c = NULL; |
@@ -1180,7 +1180,7 @@ client_request_x11(const char *request_type, int rchan) | |||
1180 | return c; | 1180 | return c; |
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | static Channel* | 1183 | static Channel * |
1184 | client_request_agent(const char *request_type, int rchan) | 1184 | client_request_agent(const char *request_type, int rchan) |
1185 | { | 1185 | { |
1186 | Channel *c = NULL; | 1186 | Channel *c = NULL; |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.45 2002/06/23 03:26:19 deraadt Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.46 2002/06/30 21:59:45 deraadt Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -171,7 +171,7 @@ key_equal(Key *a, Key *b) | |||
171 | return 0; | 171 | return 0; |
172 | } | 172 | } |
173 | 173 | ||
174 | static u_char* | 174 | static u_char * |
175 | key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) | 175 | key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) |
176 | { | 176 | { |
177 | const EVP_MD *md = NULL; | 177 | const EVP_MD *md = NULL; |
@@ -227,8 +227,8 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) | |||
227 | return retval; | 227 | return retval; |
228 | } | 228 | } |
229 | 229 | ||
230 | static char* | 230 | static char * |
231 | key_fingerprint_hex(u_char* dgst_raw, u_int dgst_raw_len) | 231 | key_fingerprint_hex(u_char *dgst_raw, u_int dgst_raw_len) |
232 | { | 232 | { |
233 | char *retval; | 233 | char *retval; |
234 | int i; | 234 | int i; |
@@ -244,8 +244,8 @@ key_fingerprint_hex(u_char* dgst_raw, u_int dgst_raw_len) | |||
244 | return retval; | 244 | return retval; |
245 | } | 245 | } |
246 | 246 | ||
247 | static char* | 247 | static char * |
248 | key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len) | 248 | key_fingerprint_bubblebabble(u_char *dgst_raw, u_int dgst_raw_len) |
249 | { | 249 | { |
250 | char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; | 250 | char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; |
251 | char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', | 251 | char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', |
@@ -291,7 +291,7 @@ key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len) | |||
291 | return retval; | 291 | return retval; |
292 | } | 292 | } |
293 | 293 | ||
294 | char* | 294 | char * |
295 | key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | 295 | key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) |
296 | { | 296 | { |
297 | char *retval = NULL; | 297 | char *retval = NULL; |
diff --git a/monitor_wrap.c b/monitor_wrap.c index 00f6c610e..eb4453fc4 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.13 2002/06/28 01:50:37 deraadt Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.14 2002/06/30 21:59:45 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -207,7 +207,7 @@ mm_getpwnamallow(const char *login) | |||
207 | return (pw); | 207 | return (pw); |
208 | } | 208 | } |
209 | 209 | ||
210 | char* mm_auth2_read_banner(void) | 210 | char *mm_auth2_read_banner(void) |
211 | { | 211 | { |
212 | Buffer m; | 212 | Buffer m; |
213 | char *banner; | 213 | char *banner; |
@@ -705,7 +705,7 @@ mm_chall_setup(char **name, char **infotxt, u_int *numprompts, | |||
705 | *name = xstrdup(""); | 705 | *name = xstrdup(""); |
706 | *infotxt = xstrdup(""); | 706 | *infotxt = xstrdup(""); |
707 | *numprompts = 1; | 707 | *numprompts = 1; |
708 | *prompts = xmalloc(*numprompts * sizeof(char*)); | 708 | *prompts = xmalloc(*numprompts * sizeof(char *)); |
709 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); | 709 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); |
710 | (*echo_on)[0] = 0; | 710 | (*echo_on)[0] = 0; |
711 | } | 711 | } |
diff --git a/monitor_wrap.h b/monitor_wrap.h index ce721247b..f97862b5b 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.5 2002/05/12 23:53:45 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.6 2002/06/30 21:59:45 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -44,7 +44,7 @@ DH *mm_choose_dh(int, int, int); | |||
44 | int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); | 44 | int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); |
45 | void mm_inform_authserv(char *, char *); | 45 | void mm_inform_authserv(char *, char *); |
46 | struct passwd *mm_getpwnamallow(const char *); | 46 | struct passwd *mm_getpwnamallow(const char *); |
47 | char* mm_auth2_read_banner(void); | 47 | char *mm_auth2_read_banner(void); |
48 | int mm_auth_password(struct Authctxt *, char *); | 48 | int mm_auth_password(struct Authctxt *, char *); |
49 | int mm_key_allowed(enum mm_keytype, char *, char *, Key *); | 49 | int mm_key_allowed(enum mm_keytype, char *, char *, Key *); |
50 | int mm_user_key_allowed(struct passwd *, Key *); | 50 | int mm_user_key_allowed(struct passwd *, Key *); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scard.h,v 1.10 2002/03/25 17:34:27 markus Exp $ */ | 1 | /* $OpenBSD: scard.h,v 1.11 2002/06/30 21:59:45 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -33,8 +33,8 @@ | |||
33 | #define SCARD_ERROR_NOCARD -2 | 33 | #define SCARD_ERROR_NOCARD -2 |
34 | #define SCARD_ERROR_APPLET -3 | 34 | #define SCARD_ERROR_APPLET -3 |
35 | 35 | ||
36 | Key **sc_get_keys(const char*, const char*); | 36 | Key **sc_get_keys(const char *, const char *); |
37 | void sc_close(void); | 37 | void sc_close(void); |
38 | int sc_put_key(Key *, const char*); | 38 | int sc_put_key(Key *, const char *); |
39 | 39 | ||
40 | #endif | 40 | #endif |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.h,v 1.18 2002/06/23 21:06:41 deraadt Exp $ */ | 1 | /* $OpenBSD: session.h,v 1.19 2002/06/30 21:59:45 deraadt 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. |
@@ -57,7 +57,7 @@ struct Session { | |||
57 | 57 | ||
58 | void do_authenticated(Authctxt *); | 58 | void do_authenticated(Authctxt *); |
59 | 59 | ||
60 | int session_open(Authctxt*, int); | 60 | int session_open(Authctxt *, int); |
61 | int session_input_channel_req(Channel *, const char *); | 61 | int session_input_channel_req(Channel *, const char *); |
62 | void session_close_by_pid(pid_t, int); | 62 | void session_close_by_pid(pid_t, int); |
63 | void session_close_by_channel(int, void *); | 63 | void session_close_by_channel(int, void *); |
diff --git a/sftp-glob.c b/sftp-glob.c index 1234074c4..2deb0eb49 100644 --- a/sftp-glob.c +++ b/sftp-glob.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sftp-glob.c,v 1.10 2002/02/13 00:59:23 djm Exp $"); | 26 | RCSID("$OpenBSD: sftp-glob.c,v 1.11 2002/06/30 21:59:45 deraadt Exp $"); |
27 | 27 | ||
28 | #include "buffer.h" | 28 | #include "buffer.h" |
29 | #include "bufaux.h" | 29 | #include "bufaux.h" |
@@ -51,12 +51,12 @@ fudge_opendir(const char *path) | |||
51 | 51 | ||
52 | r = xmalloc(sizeof(*r)); | 52 | r = xmalloc(sizeof(*r)); |
53 | 53 | ||
54 | if (do_readdir(cur.conn, (char*)path, &r->dir)) | 54 | if (do_readdir(cur.conn, (char *)path, &r->dir)) |
55 | return(NULL); | 55 | return(NULL); |
56 | 56 | ||
57 | r->offset = 0; | 57 | r->offset = 0; |
58 | 58 | ||
59 | return((void*)r); | 59 | return((void *)r); |
60 | } | 60 | } |
61 | 61 | ||
62 | static struct dirent * | 62 | static struct dirent * |
@@ -129,7 +129,7 @@ fudge_lstat(const char *path, struct stat *st) | |||
129 | { | 129 | { |
130 | Attrib *a; | 130 | Attrib *a; |
131 | 131 | ||
132 | if (!(a = do_lstat(cur.conn, (char*)path, 0))) | 132 | if (!(a = do_lstat(cur.conn, (char *)path, 0))) |
133 | return(-1); | 133 | return(-1); |
134 | 134 | ||
135 | attrib_to_stat(a, st); | 135 | attrib_to_stat(a, st); |
@@ -142,7 +142,7 @@ fudge_stat(const char *path, struct stat *st) | |||
142 | { | 142 | { |
143 | Attrib *a; | 143 | Attrib *a; |
144 | 144 | ||
145 | if (!(a = do_stat(cur.conn, (char*)path, 0))) | 145 | if (!(a = do_stat(cur.conn, (char *)path, 0))) |
146 | return(-1); | 146 | return(-1); |
147 | 147 | ||
148 | attrib_to_stat(a, st); | 148 | attrib_to_stat(a, st); |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.179 2002/06/12 01:09:52 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.180 2002/06/30 21:59:45 deraadt Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -552,7 +552,7 @@ again: | |||
552 | if (buffer_len(&command) == 0) | 552 | if (buffer_len(&command) == 0) |
553 | tty_flag = 1; | 553 | tty_flag = 1; |
554 | 554 | ||
555 | /* Force no tty*/ | 555 | /* Force no tty */ |
556 | if (no_tty_flag) | 556 | if (no_tty_flag) |
557 | tty_flag = 0; | 557 | tty_flag = 0; |
558 | /* Do not allocate a tty if stdin is not a tty. */ | 558 | /* Do not allocate a tty if stdin is not a tty. */ |
@@ -637,7 +637,8 @@ again: | |||
637 | if (options.rhosts_rsa_authentication || | 637 | if (options.rhosts_rsa_authentication || |
638 | options.hostbased_authentication) { | 638 | options.hostbased_authentication) { |
639 | sensitive_data.nkeys = 3; | 639 | sensitive_data.nkeys = 3; |
640 | sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); | 640 | sensitive_data.keys = xmalloc(sensitive_data.nkeys * |
641 | sizeof(Key)); | ||
641 | 642 | ||
642 | PRIV_START; | 643 | PRIV_START; |
643 | sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, | 644 | sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, |
diff --git a/sshconnect2.c b/sshconnect2.c index 215f76ca2..d396c77c6 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.105 2002/06/23 03:30:17 deraadt Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.106 2002/06/30 21:59:45 deraadt Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -422,7 +422,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) | |||
422 | clear_auth_state(authctxt); | 422 | clear_auth_state(authctxt); |
423 | dispatch_set(SSH2_MSG_USERAUTH_PK_OK, NULL); | 423 | dispatch_set(SSH2_MSG_USERAUTH_PK_OK, NULL); |
424 | 424 | ||
425 | /* try another method if we did not send a packet*/ | 425 | /* try another method if we did not send a packet */ |
426 | if (sent == 0) | 426 | if (sent == 0) |
427 | userauth(authctxt, NULL); | 427 | userauth(authctxt, NULL); |
428 | 428 | ||
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.254 2002/06/30 21:54:16 deraadt Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.255 2002/06/30 21:59:45 deraadt Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -550,7 +550,7 @@ privsep_preauth_child(void) | |||
550 | memset(pw->pw_passwd, 0, strlen(pw->pw_passwd)); | 550 | memset(pw->pw_passwd, 0, strlen(pw->pw_passwd)); |
551 | endpwent(); | 551 | endpwent(); |
552 | 552 | ||
553 | /* Change our root directory*/ | 553 | /* Change our root directory */ |
554 | if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) | 554 | if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) |
555 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, | 555 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, |
556 | strerror(errno)); | 556 | strerror(errno)); |
@@ -573,7 +573,7 @@ privsep_preauth_child(void) | |||
573 | #endif | 573 | #endif |
574 | } | 574 | } |
575 | 575 | ||
576 | static Authctxt* | 576 | static Authctxt * |
577 | privsep_preauth(void) | 577 | privsep_preauth(void) |
578 | { | 578 | { |
579 | Authctxt *authctxt = NULL; | 579 | Authctxt *authctxt = NULL; |
@@ -958,7 +958,8 @@ main(int ac, char **av) | |||
958 | debug("sshd version %.100s", SSH_VERSION); | 958 | debug("sshd version %.100s", SSH_VERSION); |
959 | 959 | ||
960 | /* load private host keys */ | 960 | /* load private host keys */ |
961 | sensitive_data.host_keys = xmalloc(options.num_host_key_files*sizeof(Key*)); | 961 | sensitive_data.host_keys = xmalloc(options.num_host_key_files * |
962 | sizeof(Key *)); | ||
962 | for (i = 0; i < options.num_host_key_files; i++) | 963 | for (i = 0; i < options.num_host_key_files; i++) |
963 | sensitive_data.host_keys[i] = NULL; | 964 | sensitive_data.host_keys[i] = NULL; |
964 | sensitive_data.server_key = NULL; | 965 | sensitive_data.server_key = NULL; |