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 /md-sha256.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 'md-sha256.c')
-rw-r--r-- | md-sha256.c | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/md-sha256.c b/md-sha256.c new file mode 100644 index 000000000..8c1b3b92d --- /dev/null +++ b/md-sha256.c | |||
@@ -0,0 +1,86 @@ | |||
1 | /* $OpenBSD: md-sha256.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2005 Damien Miller <djm@openbsd.org> | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | /* EVP wrapper for SHA256 */ | ||
19 | |||
20 | #include "includes.h" | ||
21 | |||
22 | #include <sys/types.h> | ||
23 | #include <openssl/opensslv.h> | ||
24 | |||
25 | #if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) | ||
26 | |||
27 | #include <string.h> | ||
28 | #include <openssl/evp.h> | ||
29 | #ifdef HAVE_SHA256_UPDATE | ||
30 | # ifdef HAVE_SHA2_H | ||
31 | # include <sha2.h> | ||
32 | # elif defined(HAVE_CRYPTO_SHA2_H) | ||
33 | # include <crypto/sha2.h> | ||
34 | # endif | ||
35 | #endif | ||
36 | |||
37 | const EVP_MD *evp_ssh_sha256(void); | ||
38 | |||
39 | static int | ||
40 | ssh_sha256_init(EVP_MD_CTX *ctxt) | ||
41 | { | ||
42 | SHA256_Init(ctxt->md_data); | ||
43 | return (1); | ||
44 | } | ||
45 | |||
46 | static int | ||
47 | ssh_sha256_update(EVP_MD_CTX *ctxt, const void *data, unsigned long len) | ||
48 | { | ||
49 | SHA256_Update(ctxt->md_data, data, len); | ||
50 | return (1); | ||
51 | } | ||
52 | |||
53 | static int | ||
54 | ssh_sha256_final(EVP_MD_CTX *ctxt, unsigned char *digest) | ||
55 | { | ||
56 | SHA256_Final(digest, ctxt->md_data); | ||
57 | return (1); | ||
58 | } | ||
59 | |||
60 | static int | ||
61 | ssh_sha256_cleanup(EVP_MD_CTX *ctxt) | ||
62 | { | ||
63 | memset(ctxt->md_data, 0, sizeof(SHA256_CTX)); | ||
64 | return (1); | ||
65 | } | ||
66 | |||
67 | const EVP_MD * | ||
68 | evp_ssh_sha256(void) | ||
69 | { | ||
70 | static EVP_MD ssh_sha256; | ||
71 | |||
72 | memset(&ssh_sha256, 0, sizeof(ssh_sha256)); | ||
73 | ssh_sha256.type = NID_undef; | ||
74 | ssh_sha256.md_size = SHA256_DIGEST_LENGTH; | ||
75 | ssh_sha256.init = ssh_sha256_init; | ||
76 | ssh_sha256.update = ssh_sha256_update; | ||
77 | ssh_sha256.final = ssh_sha256_final; | ||
78 | ssh_sha256.cleanup = ssh_sha256_cleanup; | ||
79 | ssh_sha256.block_size = SHA256_BLOCK_LENGTH; | ||
80 | ssh_sha256.ctx_size = sizeof(SHA256_CTX); | ||
81 | |||
82 | return (&ssh_sha256); | ||
83 | } | ||
84 | |||
85 | #endif /* !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) */ | ||
86 | |||