diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /atomicio.c | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'atomicio.c')
-rw-r--r-- | atomicio.c | 69 |
1 files changed, 62 insertions, 7 deletions
diff --git a/atomicio.c b/atomicio.c index 12abbda16..f651a292c 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -1,4 +1,6 @@ | |||
1 | /* $OpenBSD: atomicio.c,v 1.23 2006/08/03 03:34:41 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
3 | * Copyright (c) 2006 Damien Miller. All rights reserved. | ||
2 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. | 4 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. |
3 | * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. | 5 | * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. |
4 | * All rights reserved. | 6 | * All rights reserved. |
@@ -25,7 +27,12 @@ | |||
25 | */ | 27 | */ |
26 | 28 | ||
27 | #include "includes.h" | 29 | #include "includes.h" |
28 | RCSID("$OpenBSD: atomicio.c,v 1.13 2005/05/24 17:32:43 avsm Exp $"); | 30 | |
31 | #include <sys/param.h> | ||
32 | #include <sys/uio.h> | ||
33 | |||
34 | #include <errno.h> | ||
35 | #include <string.h> | ||
29 | 36 | ||
30 | #include "atomicio.h" | 37 | #include "atomicio.h" |
31 | 38 | ||
@@ -33,11 +40,7 @@ RCSID("$OpenBSD: atomicio.c,v 1.13 2005/05/24 17:32:43 avsm Exp $"); | |||
33 | * ensure all of data on socket comes through. f==read || f==vwrite | 40 | * ensure all of data on socket comes through. f==read || f==vwrite |
34 | */ | 41 | */ |
35 | size_t | 42 | size_t |
36 | atomicio(f, fd, _s, n) | 43 | atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n) |
37 | ssize_t (*f) (int, void *, size_t); | ||
38 | int fd; | ||
39 | void *_s; | ||
40 | size_t n; | ||
41 | { | 44 | { |
42 | char *s = _s; | 45 | char *s = _s; |
43 | size_t pos = 0; | 46 | size_t pos = 0; |
@@ -58,8 +61,60 @@ atomicio(f, fd, _s, n) | |||
58 | errno = EPIPE; | 61 | errno = EPIPE; |
59 | return pos; | 62 | return pos; |
60 | default: | 63 | default: |
61 | pos += (u_int)res; | 64 | pos += (size_t)res; |
62 | } | 65 | } |
63 | } | 66 | } |
64 | return (pos); | 67 | return (pos); |
65 | } | 68 | } |
69 | |||
70 | /* | ||
71 | * ensure all of data on socket comes through. f==readv || f==writev | ||
72 | */ | ||
73 | size_t | ||
74 | atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd, | ||
75 | const struct iovec *_iov, int iovcnt) | ||
76 | { | ||
77 | size_t pos = 0, rem; | ||
78 | ssize_t res; | ||
79 | struct iovec iov_array[IOV_MAX], *iov = iov_array; | ||
80 | |||
81 | if (iovcnt > IOV_MAX) { | ||
82 | errno = EINVAL; | ||
83 | return 0; | ||
84 | } | ||
85 | /* Make a copy of the iov array because we may modify it below */ | ||
86 | memcpy(iov, _iov, iovcnt * sizeof(*_iov)); | ||
87 | |||
88 | for (; iovcnt > 0 && iov[0].iov_len > 0;) { | ||
89 | res = (f) (fd, iov, iovcnt); | ||
90 | switch (res) { | ||
91 | case -1: | ||
92 | if (errno == EINTR || errno == EAGAIN) | ||
93 | continue; | ||
94 | return 0; | ||
95 | case 0: | ||
96 | errno = EPIPE; | ||
97 | return pos; | ||
98 | default: | ||
99 | rem = (size_t)res; | ||
100 | pos += rem; | ||
101 | /* skip completed iov entries */ | ||
102 | while (iovcnt > 0 && rem >= iov[0].iov_len) { | ||
103 | rem -= iov[0].iov_len; | ||
104 | iov++; | ||
105 | iovcnt--; | ||
106 | } | ||
107 | /* This shouldn't happen... */ | ||
108 | if (rem > 0 && (iovcnt <= 0 || rem > iov[0].iov_len)) { | ||
109 | errno = EFAULT; | ||
110 | return 0; | ||
111 | } | ||
112 | if (iovcnt == 0) | ||
113 | break; | ||
114 | /* update pointer in partially complete iov */ | ||
115 | iov[0].iov_base = ((char *)iov[0].iov_base) + rem; | ||
116 | iov[0].iov_len -= rem; | ||
117 | } | ||
118 | } | ||
119 | return pos; | ||
120 | } | ||