diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-17 17:02:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-17 17:02:09 +1000 |
commit | 46d38de48b1018c74040d2399bafbedf50247529 (patch) | |
tree | 48255e4d9fc4bbd22615a35f4f5d4537873cba68 | |
parent | 4f1adad4f65d63645689d2d947876848b0813390 (diff) |
- djm@cvs.openbsd.org 2005/07/16 01:35:24
[auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c]
[sshconnect.c]
spacing
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | auth1.c | 4 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | cipher.c | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | session.c | 12 | ||||
-rw-r--r-- | ssh.c | 12 | ||||
-rw-r--r-- | sshconnect.c | 4 |
9 files changed, 32 insertions, 25 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20050717 | ||
2 | - OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2005/07/16 01:35:24 | ||
4 | [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] | ||
5 | [sshconnect.c] | ||
6 | spacing | ||
7 | |||
1 | 20050716 | 8 | 20050716 |
2 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication | 9 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication |
3 | socketpair stays open on in both the monitor and PAM process. Patch from | 10 | socketpair stays open on in both the monitor and PAM process. Patch from |
@@ -2830,4 +2837,4 @@ | |||
2830 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2837 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2831 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2838 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2832 | 2839 | ||
2833 | $Id: ChangeLog,v 1.3846 2005/07/16 01:33:06 dtucker Exp $ | 2840 | $Id: ChangeLog,v 1.3847 2005/07/17 07:02:09 djm Exp $ |
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.61 2005/06/17 02:44:32 djm Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -179,7 +179,7 @@ static int | |||
179 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | 179 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) |
180 | { | 180 | { |
181 | char *challenge; | 181 | char *challenge; |
182 | 182 | ||
183 | if ((challenge = get_challenge(authctxt)) == NULL) | 183 | if ((challenge = get_challenge(authctxt)) == NULL) |
184 | return (0); | 184 | return (0); |
185 | 185 | ||
diff --git a/channels.c b/channels.c index a7c69a066..b7ff85007 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.220 2005/07/04 14:04:11 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.221 2005/07/16 01:35:24 djm Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -2986,7 +2986,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, | |||
2986 | /* Save protocol name. */ | 2986 | /* Save protocol name. */ |
2987 | x11_saved_proto = xstrdup(proto); | 2987 | x11_saved_proto = xstrdup(proto); |
2988 | /* | 2988 | /* |
2989 | * Extract real authentication data and generate fake data | 2989 | * Extract real authentication data and generate fake data |
2990 | * of the same length. | 2990 | * of the same length. |
2991 | */ | 2991 | */ |
2992 | x11_saved_data = xmalloc(data_len); | 2992 | x11_saved_data = xmalloc(data_len); |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.76 2005/06/17 02:44:32 djm Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.77 2005/07/16 01:35:24 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -249,7 +249,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, | |||
249 | cipher->name); | 249 | cipher->name); |
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | if (cipher->discard_len > 0) { | 252 | if (cipher->discard_len > 0) { |
253 | junk = xmalloc(cipher->discard_len); | 253 | junk = xmalloc(cipher->discard_len); |
254 | discard = xmalloc(cipher->discard_len); | 254 | discard = xmalloc(cipher->discard_len); |
255 | if (EVP_Cipher(&cc->evp, discard, junk, | 255 | if (EVP_Cipher(&cc->evp, discard, junk, |
diff --git a/clientloop.c b/clientloop.c index 9611a5e3e..47f3c7ecd 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.140 2005/07/04 00:58:43 djm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.141 2005/07/16 01:35:24 djm Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -642,7 +642,7 @@ client_extra_session2_setup(int id, void *arg) | |||
642 | if ((c = channel_lookup(id)) == NULL) | 642 | if ((c = channel_lookup(id)) == NULL) |
643 | fatal("%s: no channel for id %d", __func__, id); | 643 | fatal("%s: no channel for id %d", __func__, id); |
644 | 644 | ||
645 | display = getenv("DISPLAY"); | 645 | display = getenv("DISPLAY"); |
646 | if (cctx->want_x_fwd && options.forward_x11 && display != NULL) { | 646 | if (cctx->want_x_fwd && options.forward_x11 && display != NULL) { |
647 | char *proto, *data; | 647 | char *proto, *data; |
648 | /* Get reasonable local authentication information. */ | 648 | /* Get reasonable local authentication information. */ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.61 2005/06/17 02:44:32 djm Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -411,7 +411,7 @@ derive_key(Kex *kex, int id, u_int need, u_char *hash, BIGNUM *shared_secret) | |||
411 | u_int have; | 411 | u_int have; |
412 | int mdsz = EVP_MD_size(evp_md); | 412 | int mdsz = EVP_MD_size(evp_md); |
413 | u_char *digest; | 413 | u_char *digest; |
414 | 414 | ||
415 | if (mdsz < 0) | 415 | if (mdsz < 0) |
416 | fatal("derive_key: mdsz < 0"); | 416 | fatal("derive_key: mdsz < 0"); |
417 | digest = xmalloc(roundup(need, mdsz)); | 417 | digest = xmalloc(roundup(need, mdsz)); |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.182 2005/06/17 02:44:33 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.183 2005/07/16 01:35:24 djm Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -196,11 +196,11 @@ auth_input_request_forwarding(struct passwd * pw) | |||
196 | static void | 196 | static void |
197 | display_loginmsg(void) | 197 | display_loginmsg(void) |
198 | { | 198 | { |
199 | if (buffer_len(&loginmsg) > 0) { | 199 | if (buffer_len(&loginmsg) > 0) { |
200 | buffer_append(&loginmsg, "\0", 1); | 200 | buffer_append(&loginmsg, "\0", 1); |
201 | printf("%s", (char *)buffer_ptr(&loginmsg)); | 201 | printf("%s", (char *)buffer_ptr(&loginmsg)); |
202 | buffer_clear(&loginmsg); | 202 | buffer_clear(&loginmsg); |
203 | } | 203 | } |
204 | } | 204 | } |
205 | 205 | ||
206 | void | 206 | void |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.247 2005/07/04 00:58:43 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.248 2005/07/16 01:35:24 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -790,8 +790,8 @@ ssh_init_forwarding(void) | |||
790 | for (i = 0; i < options.num_remote_forwards; i++) { | 790 | for (i = 0; i < options.num_remote_forwards; i++) { |
791 | debug("Remote connections from %.200s:%d forwarded to " | 791 | debug("Remote connections from %.200s:%d forwarded to " |
792 | "local address %.200s:%d", | 792 | "local address %.200s:%d", |
793 | (options.remote_forwards[i].listen_host == NULL) ? | 793 | (options.remote_forwards[i].listen_host == NULL) ? |
794 | (options.gateway_ports ? "*" : "LOCALHOST") : | 794 | (options.gateway_ports ? "*" : "LOCALHOST") : |
795 | options.remote_forwards[i].listen_host, | 795 | options.remote_forwards[i].listen_host, |
796 | options.remote_forwards[i].listen_port, | 796 | options.remote_forwards[i].listen_port, |
797 | options.remote_forwards[i].connect_host, | 797 | options.remote_forwards[i].connect_host, |
@@ -1037,7 +1037,7 @@ ssh_session2_setup(int id, void *arg) | |||
1037 | const char *display; | 1037 | const char *display; |
1038 | int interactive = tty_flag; | 1038 | int interactive = tty_flag; |
1039 | 1039 | ||
1040 | display = getenv("DISPLAY"); | 1040 | display = getenv("DISPLAY"); |
1041 | if (options.forward_x11 && display != NULL) { | 1041 | if (options.forward_x11 && display != NULL) { |
1042 | char *proto, *data; | 1042 | char *proto, *data; |
1043 | /* Get reasonable local authentication information. */ | 1043 | /* Get reasonable local authentication information. */ |
@@ -1253,7 +1253,7 @@ control_client(const char *path) | |||
1253 | close(sock); | 1253 | close(sock); |
1254 | return; | 1254 | return; |
1255 | } | 1255 | } |
1256 | 1256 | ||
1257 | if (stdin_null_flag) { | 1257 | if (stdin_null_flag) { |
1258 | if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1) | 1258 | if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1) |
1259 | fatal("open(/dev/null): %s", strerror(errno)); | 1259 | fatal("open(/dev/null): %s", strerror(errno)); |
@@ -1262,7 +1262,7 @@ control_client(const char *path) | |||
1262 | if (fd > STDERR_FILENO) | 1262 | if (fd > STDERR_FILENO) |
1263 | close(fd); | 1263 | close(fd); |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | term = getenv("TERM"); | 1266 | term = getenv("TERM"); |
1267 | 1267 | ||
1268 | flags = 0; | 1268 | flags = 0; |
diff --git a/sshconnect.c b/sshconnect.c index 92f0f3800..84f287145 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.166 2005/06/17 22:53:47 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.167 2005/07/16 01:35:24 djm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -404,7 +404,7 @@ ssh_exchange_identification(void) | |||
404 | for (i = 0; i < sizeof(buf) - 1; i++) { | 404 | for (i = 0; i < sizeof(buf) - 1; i++) { |
405 | size_t len = atomicio(read, connection_in, &buf[i], 1); | 405 | size_t len = atomicio(read, connection_in, &buf[i], 1); |
406 | 406 | ||
407 | if (len != 1 && errno == EPIPE) | 407 | if (len != 1 && errno == EPIPE) |
408 | fatal("ssh_exchange_identification: Connection closed by remote host"); | 408 | fatal("ssh_exchange_identification: Connection closed by remote host"); |
409 | else if (len != 1) | 409 | else if (len != 1) |
410 | fatal("ssh_exchange_identification: read: %.100s", strerror(errno)); | 410 | fatal("ssh_exchange_identification: read: %.100s", strerror(errno)); |