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 /openbsd-compat/sha2.h | |
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 'openbsd-compat/sha2.h')
-rwxr-xr-x | openbsd-compat/sha2.h | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/openbsd-compat/sha2.h b/openbsd-compat/sha2.h new file mode 100755 index 000000000..821f2dd6c --- /dev/null +++ b/openbsd-compat/sha2.h | |||
@@ -0,0 +1,133 @@ | |||
1 | /* $OpenBSD: sha2.h,v 1.6 2004/06/22 01:57:30 jfb Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * FILE: sha2.h | ||
5 | * AUTHOR: Aaron D. Gifford <me@aarongifford.com> | ||
6 | * | ||
7 | * Copyright (c) 2000-2001, Aaron D. Gifford | ||
8 | * All rights reserved. | ||
9 | * | ||
10 | * Redistribution and use in source and binary forms, with or without | ||
11 | * modification, are permitted provided that the following conditions | ||
12 | * are met: | ||
13 | * 1. Redistributions of source code must retain the above copyright | ||
14 | * notice, this list of conditions and the following disclaimer. | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in the | ||
17 | * documentation and/or other materials provided with the distribution. | ||
18 | * 3. Neither the name of the copyright holder nor the names of contributors | ||
19 | * may be used to endorse or promote products derived from this software | ||
20 | * without specific prior written permission. | ||
21 | * | ||
22 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND | ||
23 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
24 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
25 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE | ||
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
27 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
28 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
29 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
30 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
32 | * SUCH DAMAGE. | ||
33 | * | ||
34 | * $From: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ | ||
35 | */ | ||
36 | |||
37 | /* OPENBSD ORIGINAL: include/sha2.h */ | ||
38 | |||
39 | #ifndef _SSHSHA2_H | ||
40 | #define _SSHSHA2_H | ||
41 | |||
42 | #include "includes.h" | ||
43 | |||
44 | #include <openssl/opensslv.h> | ||
45 | |||
46 | #if !defined(HAVE_EVP_SHA256) && !defined(HAVE_SHA256_UPDATE) && \ | ||
47 | (OPENSSL_VERSION_NUMBER >= 0x00907000L) | ||
48 | |||
49 | /*** SHA-256/384/512 Various Length Definitions ***********************/ | ||
50 | #define SHA256_BLOCK_LENGTH 64 | ||
51 | #define SHA256_DIGEST_LENGTH 32 | ||
52 | #define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1) | ||
53 | #define SHA384_BLOCK_LENGTH 128 | ||
54 | #define SHA384_DIGEST_LENGTH 48 | ||
55 | #define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1) | ||
56 | #define SHA512_BLOCK_LENGTH 128 | ||
57 | #define SHA512_DIGEST_LENGTH 64 | ||
58 | #define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1) | ||
59 | |||
60 | |||
61 | /*** SHA-256/384/512 Context Structures *******************************/ | ||
62 | typedef struct _SHA256_CTX { | ||
63 | u_int32_t state[8]; | ||
64 | u_int64_t bitcount; | ||
65 | u_int8_t buffer[SHA256_BLOCK_LENGTH]; | ||
66 | } SHA256_CTX; | ||
67 | typedef struct _SHA512_CTX { | ||
68 | u_int64_t state[8]; | ||
69 | u_int64_t bitcount[2]; | ||
70 | u_int8_t buffer[SHA512_BLOCK_LENGTH]; | ||
71 | } SHA512_CTX; | ||
72 | |||
73 | #if 0 | ||
74 | typedef SHA512_CTX SHA384_CTX; | ||
75 | #endif | ||
76 | |||
77 | void SHA256_Init(SHA256_CTX *); | ||
78 | void SHA256_Transform(u_int32_t state[8], const u_int8_t [SHA256_BLOCK_LENGTH]); | ||
79 | void SHA256_Update(SHA256_CTX *, const u_int8_t *, size_t) | ||
80 | __attribute__((__bounded__(__string__,2,3))); | ||
81 | void SHA256_Pad(SHA256_CTX *); | ||
82 | void SHA256_Final(u_int8_t [SHA256_DIGEST_LENGTH], SHA256_CTX *) | ||
83 | __attribute__((__bounded__(__minbytes__,1,SHA256_DIGEST_LENGTH))); | ||
84 | char *SHA256_End(SHA256_CTX *, char *) | ||
85 | __attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH))); | ||
86 | char *SHA256_File(const char *, char *) | ||
87 | __attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH))); | ||
88 | char *SHA256_FileChunk(const char *, char *, off_t, off_t) | ||
89 | __attribute__((__bounded__(__minbytes__,2,SHA256_DIGEST_STRING_LENGTH))); | ||
90 | char *SHA256_Data(const u_int8_t *, size_t, char *) | ||
91 | __attribute__((__bounded__(__string__,1,2))) | ||
92 | __attribute__((__bounded__(__minbytes__,3,SHA256_DIGEST_STRING_LENGTH))); | ||
93 | |||
94 | #if 0 | ||
95 | void SHA384_Init(SHA384_CTX *); | ||
96 | void SHA384_Transform(u_int64_t state[8], const u_int8_t [SHA384_BLOCK_LENGTH]); | ||
97 | void SHA384_Update(SHA384_CTX *, const u_int8_t *, size_t) | ||
98 | __attribute__((__bounded__(__string__,2,3))); | ||
99 | void SHA384_Pad(SHA384_CTX *); | ||
100 | void SHA384_Final(u_int8_t [SHA384_DIGEST_LENGTH], SHA384_CTX *) | ||
101 | __attribute__((__bounded__(__minbytes__,1,SHA384_DIGEST_LENGTH))); | ||
102 | char *SHA384_End(SHA384_CTX *, char *) | ||
103 | __attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH))); | ||
104 | char *SHA384_File(const char *, char *) | ||
105 | __attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH))); | ||
106 | char *SHA384_FileChunk(const char *, char *, off_t, off_t) | ||
107 | __attribute__((__bounded__(__minbytes__,2,SHA384_DIGEST_STRING_LENGTH))); | ||
108 | char *SHA384_Data(const u_int8_t *, size_t, char *) | ||
109 | __attribute__((__bounded__(__string__,1,2))) | ||
110 | __attribute__((__bounded__(__minbytes__,3,SHA384_DIGEST_STRING_LENGTH))); | ||
111 | #endif /* 0 */ | ||
112 | |||
113 | void SHA512_Init(SHA512_CTX *); | ||
114 | void SHA512_Transform(u_int64_t state[8], const u_int8_t [SHA512_BLOCK_LENGTH]); | ||
115 | void SHA512_Update(SHA512_CTX *, const u_int8_t *, size_t) | ||
116 | __attribute__((__bounded__(__string__,2,3))); | ||
117 | void SHA512_Pad(SHA512_CTX *); | ||
118 | void SHA512_Final(u_int8_t [SHA512_DIGEST_LENGTH], SHA512_CTX *) | ||
119 | __attribute__((__bounded__(__minbytes__,1,SHA512_DIGEST_LENGTH))); | ||
120 | char *SHA512_End(SHA512_CTX *, char *) | ||
121 | __attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH))); | ||
122 | char *SHA512_File(const char *, char *) | ||
123 | __attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH))); | ||
124 | char *SHA512_FileChunk(const char *, char *, off_t, off_t) | ||
125 | __attribute__((__bounded__(__minbytes__,2,SHA512_DIGEST_STRING_LENGTH))); | ||
126 | char *SHA512_Data(const u_int8_t *, size_t, char *) | ||
127 | __attribute__((__bounded__(__string__,1,2))) | ||
128 | __attribute__((__bounded__(__minbytes__,3,SHA512_DIGEST_STRING_LENGTH))); | ||
129 | |||
130 | #endif /* !defined(HAVE_EVP_SHA256) && !defined(HAVE_SHA256_UPDATE) && \ | ||
131 | (OPENSSL_VERSION_NUMBER >= 0x00907000L) */ | ||
132 | |||
133 | #endif /* _SSHSHA2_H */ | ||