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 /entropy.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 'entropy.c')
-rw-r--r-- | entropy.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -24,6 +24,20 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | #include <sys/types.h> | ||
28 | #include <sys/wait.h> | ||
29 | |||
30 | #ifdef HAVE_SYS_STAT_H | ||
31 | # include <sys/stat.h> | ||
32 | #endif | ||
33 | |||
34 | #ifdef HAVE_FCNTL_H | ||
35 | # include <fcntl.h> | ||
36 | #endif | ||
37 | #include <stdarg.h> | ||
38 | #include <unistd.h> | ||
39 | #include <signal.h> | ||
40 | |||
27 | #include <openssl/rand.h> | 41 | #include <openssl/rand.h> |
28 | #include <openssl/crypto.h> | 42 | #include <openssl/crypto.h> |
29 | #include <openssl/err.h> | 43 | #include <openssl/err.h> |
@@ -35,7 +49,6 @@ | |||
35 | #include "pathnames.h" | 49 | #include "pathnames.h" |
36 | #include "log.h" | 50 | #include "log.h" |
37 | #include "buffer.h" | 51 | #include "buffer.h" |
38 | #include "bufaux.h" | ||
39 | 52 | ||
40 | /* | 53 | /* |
41 | * Portable OpenSSH PRNG seeding: | 54 | * Portable OpenSSH PRNG seeding: |
@@ -48,8 +61,6 @@ | |||
48 | * XXX: we should tell the child how many bytes we need. | 61 | * XXX: we should tell the child how many bytes we need. |
49 | */ | 62 | */ |
50 | 63 | ||
51 | RCSID("$Id: entropy.c,v 1.52 2005/09/27 22:26:30 dtucker Exp $"); | ||
52 | |||
53 | #ifndef OPENSSL_PRNG_ONLY | 64 | #ifndef OPENSSL_PRNG_ONLY |
54 | #define RANDOM_SEED_SIZE 48 | 65 | #define RANDOM_SEED_SIZE 48 |
55 | static uid_t original_uid, original_euid; | 66 | static uid_t original_uid, original_euid; |