diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 23:53:30 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 23:53:30 +0000 |
commit | df03186a4f9e0c2ece398b5c0571cb6263d7a752 (patch) | |
tree | 1aab079441dff9615274769b19f2d734ddf508dd /monitor_wrap.h | |
parent | 6ad6994c288662fca6949f42bf91fec2aff00bca (diff) | |
parent | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (diff) |
* New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
for a while, but there's no GSSAPI patch available for it yet.
- Change the default cipher order to prefer the AES CTR modes and the
revised "arcfour256" mode to CBC mode ciphers that are susceptible to
CPNI-957037 "Plaintext Recovery Attack Against SSH".
- Add countermeasures to mitigate CPNI-957037-style attacks against the
SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
packet length or Message Authentication Code, ssh/sshd will continue
reading up to the maximum supported packet length rather than
immediately terminating the connection. This eliminates most of the
known differences in behaviour that leaked information about the
plaintext of injected data which formed the basis of this attack
(closes: #506115, LP: #379329).
- ForceCommand directive now accepts commandline arguments for the
internal-sftp server (closes: #524423, LP: #362511).
- Add AllowAgentForwarding to available Match keywords list (closes:
#540623).
- Make ssh(1) send the correct channel number for
SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
avoid triggering 'Non-public channel' error messages on sshd(8) in
openssh-5.1.
- Avoid printing 'Non-public channel' warnings in sshd(8), since the
ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
behaviour introduced in openssh-5.1; closes: #496017).
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
including cascading credentials support (LP: #416958).
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 5920a90b2..0b85bea6f 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.21 2008/11/04 08:22:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -58,9 +58,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *); | |||
58 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 58 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
59 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, | 59 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, |
60 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); | 60 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
61 | int mm_ssh_gssapi_userok(char *user); | 61 | int mm_ssh_gssapi_userok(char *user, struct passwd *); |
62 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | 62 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); |
63 | OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); | 63 | OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); |
64 | int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); | ||
64 | #endif | 65 | #endif |
65 | 66 | ||
66 | #ifdef USE_PAM | 67 | #ifdef USE_PAM |
@@ -103,6 +104,26 @@ int mm_bsdauth_respond(void *, u_int, char **); | |||
103 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | 104 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); |
104 | int mm_skey_respond(void *, u_int, char **); | 105 | int mm_skey_respond(void *, u_int, char **); |
105 | 106 | ||
107 | /* jpake */ | ||
108 | struct jpake_group; | ||
109 | void mm_auth2_jpake_get_pwdata(struct Authctxt *, BIGNUM **, char **, char **); | ||
110 | void mm_jpake_step1(struct jpake_group *, u_char **, u_int *, | ||
111 | BIGNUM **, BIGNUM **, BIGNUM **, BIGNUM **, | ||
112 | u_char **, u_int *, u_char **, u_int *); | ||
113 | void mm_jpake_step2(struct jpake_group *, BIGNUM *, | ||
114 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | ||
115 | const u_char *, u_int, const u_char *, u_int, | ||
116 | const u_char *, u_int, const u_char *, u_int, | ||
117 | BIGNUM **, u_char **, u_int *); | ||
118 | void mm_jpake_key_confirm(struct jpake_group *, BIGNUM *, BIGNUM *, | ||
119 | BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, | ||
120 | const u_char *, u_int, const u_char *, u_int, | ||
121 | const u_char *, u_int, const u_char *, u_int, | ||
122 | BIGNUM **, u_char **, u_int *); | ||
123 | int mm_jpake_check_confirm(const BIGNUM *, | ||
124 | const u_char *, u_int, const u_char *, u_int, const u_char *, u_int); | ||
125 | |||
126 | |||
106 | /* zlib allocation hooks */ | 127 | /* zlib allocation hooks */ |
107 | 128 | ||
108 | void *mm_zalloc(struct mm_master *, u_int, u_int); | 129 | void *mm_zalloc(struct mm_master *, u_int, u_int); |