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 /rsa.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 'rsa.c')
-rw-r--r-- | rsa.c | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: rsa.c,v 1.29 2006/11/06 21:25:28 markus Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -60,11 +61,15 @@ | |||
60 | */ | 61 | */ |
61 | 62 | ||
62 | #include "includes.h" | 63 | #include "includes.h" |
63 | RCSID("$OpenBSD: rsa.c,v 1.24 2001/12/27 18:22:16 markus Exp $"); | ||
64 | 64 | ||
65 | #include <sys/types.h> | ||
66 | |||
67 | #include <stdarg.h> | ||
68 | #include <string.h> | ||
69 | |||
70 | #include "xmalloc.h" | ||
65 | #include "rsa.h" | 71 | #include "rsa.h" |
66 | #include "log.h" | 72 | #include "log.h" |
67 | #include "xmalloc.h" | ||
68 | 73 | ||
69 | void | 74 | void |
70 | rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) | 75 | rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) |
@@ -86,7 +91,8 @@ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) | |||
86 | RSA_PKCS1_PADDING)) <= 0) | 91 | RSA_PKCS1_PADDING)) <= 0) |
87 | fatal("rsa_public_encrypt() failed"); | 92 | fatal("rsa_public_encrypt() failed"); |
88 | 93 | ||
89 | BN_bin2bn(outbuf, len, out); | 94 | if (BN_bin2bn(outbuf, len, out) == NULL) |
95 | fatal("rsa_public_encrypt: BN_bin2bn failed"); | ||
90 | 96 | ||
91 | memset(outbuf, 0, olen); | 97 | memset(outbuf, 0, olen); |
92 | memset(inbuf, 0, ilen); | 98 | memset(inbuf, 0, ilen); |
@@ -111,7 +117,8 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key) | |||
111 | RSA_PKCS1_PADDING)) <= 0) { | 117 | RSA_PKCS1_PADDING)) <= 0) { |
112 | error("rsa_private_decrypt() failed"); | 118 | error("rsa_private_decrypt() failed"); |
113 | } else { | 119 | } else { |
114 | BN_bin2bn(outbuf, len, out); | 120 | if (BN_bin2bn(outbuf, len, out) == NULL) |
121 | fatal("rsa_private_decrypt: BN_bin2bn failed"); | ||
115 | } | 122 | } |
116 | memset(outbuf, 0, olen); | 123 | memset(outbuf, 0, olen); |
117 | memset(inbuf, 0, ilen); | 124 | memset(inbuf, 0, ilen); |
@@ -132,11 +139,11 @@ rsa_generate_additional_parameters(RSA *rsa) | |||
132 | if ((ctx = BN_CTX_new()) == NULL) | 139 | if ((ctx = BN_CTX_new()) == NULL) |
133 | fatal("rsa_generate_additional_parameters: BN_CTX_new failed"); | 140 | fatal("rsa_generate_additional_parameters: BN_CTX_new failed"); |
134 | 141 | ||
135 | BN_sub(aux, rsa->q, BN_value_one()); | 142 | if ((BN_sub(aux, rsa->q, BN_value_one()) == 0) || |
136 | BN_mod(rsa->dmq1, rsa->d, aux, ctx); | 143 | (BN_mod(rsa->dmq1, rsa->d, aux, ctx) == 0) || |
137 | 144 | (BN_sub(aux, rsa->p, BN_value_one()) == 0) || | |
138 | BN_sub(aux, rsa->p, BN_value_one()); | 145 | (BN_mod(rsa->dmp1, rsa->d, aux, ctx) == 0)) |
139 | BN_mod(rsa->dmp1, rsa->d, aux, ctx); | 146 | fatal("rsa_generate_additional_parameters: BN_sub/mod failed"); |
140 | 147 | ||
141 | BN_clear_free(aux); | 148 | BN_clear_free(aux); |
142 | BN_CTX_free(ctx); | 149 | BN_CTX_free(ctx); |