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 /scard-opensc.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 'scard-opensc.c')
-rw-r--r-- | scard-opensc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scard-opensc.c b/scard-opensc.c index dd2c28df2..4751ea295 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -26,9 +26,13 @@ | |||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | #if defined(SMARTCARD) && defined(USE_OPENSC) | 27 | #if defined(SMARTCARD) && defined(USE_OPENSC) |
28 | 28 | ||
29 | #include <sys/types.h> | ||
30 | |||
29 | #include <openssl/evp.h> | 31 | #include <openssl/evp.h> |
30 | #include <openssl/x509.h> | 32 | #include <openssl/x509.h> |
31 | 33 | ||
34 | #include <stdarg.h> | ||
35 | |||
32 | #include <opensc/opensc.h> | 36 | #include <opensc/opensc.h> |
33 | #include <opensc/pkcs15.h> | 37 | #include <opensc/pkcs15.h> |
34 | 38 | ||
@@ -455,7 +459,9 @@ sc_get_keys(const char *id, const char *pin) | |||
455 | } | 459 | } |
456 | key_count = r; | 460 | key_count = r; |
457 | } | 461 | } |
458 | keys = xmalloc(sizeof(Key *) * (key_count*2+1)); | 462 | if (key_count > 1024) |
463 | fatal("Too many keys (%u), expected <= 1024", key_count); | ||
464 | keys = xcalloc(key_count * 2 + 1, sizeof(Key *)); | ||
459 | for (i = 0; i < key_count; i++) { | 465 | for (i = 0; i < key_count; i++) { |
460 | sc_pkcs15_object_t *tmp_obj = NULL; | 466 | sc_pkcs15_object_t *tmp_obj = NULL; |
461 | cert_id = ((sc_pkcs15_cert_info_t *)(certs[i]->data))->id; | 467 | cert_id = ((sc_pkcs15_cert_info_t *)(certs[i]->data))->id; |