mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 02:06:37 +00:00
38a52bd3b5
Release notes are available at https://www.openssh.com/txt/release-9.1 9.1 contains fixes for three minor memory safety problems; these have lready been merged to the copy of OpenSSH 9.0 that is in the FreeBSD base system. Some highlights copied from the release notes: Potentially-incompatible changes -------------------------------- * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config are now first-match-wins to match other directives. Previously if an environment variable was multiply specified the last set value would have been used. bz3438 * ssh-keygen(8): ssh-keygen -A (generate all default host key types) will no longer generate DSA keys, as these are insecure and have not been used by default for some years. New features ------------ * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum RSA key length. Keys below this length will be ignored for user authentication and for host authentication in sshd(8). * sftp-server(8): add a "users-groups-by-id@openssh.com" extension request that allows the client to obtain user/group names that correspond to a set of uids/gids. * sftp(1): use "users-groups-by-id@openssh.com" sftp-server extension (when available) to fill in user/group names for directory listings. * sftp-server(8): support the "home-directory" extension request defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the existing "expand-path@openssh.com", but some other clients support it. * ssh-keygen(1), sshd(8): allow certificate validity intervals, sshsig verification times and authorized_keys expiry-time options to accept dates in the UTC time zone in addition to the default of interpreting them in the system time zone. YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed with a 'Z' character. Also allow certificate validity intervals to be specified in raw seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This is intended for use by regress tests and other tools that call ssh-keygen as part of a CA workflow. bz3468 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D "/usr/libexec/sftp-server -el debug3" * ssh-keygen(1): allow the existing -U (use agent) flag to work with "-Y sign" operations, where it will be interpreted to require that the private keys is hosted in an agent; bz3429 MFC after: 2 weeks Relnotes: Yes Sponsored by: The FreeBSD Foundation
100 lines
2.3 KiB
C
100 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2004 Darren Tucker.
|
|
*
|
|
* Based originally on asprintf.c from OpenBSD:
|
|
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
/*
|
|
* Don't let systems with broken printf(3) avoid our replacements
|
|
* via asprintf(3)/vasprintf(3) calling libc internally.
|
|
*/
|
|
#if defined(BROKEN_SNPRINTF)
|
|
# undef HAVE_VASPRINTF
|
|
# undef HAVE_ASPRINTF
|
|
#endif
|
|
|
|
#ifndef HAVE_VASPRINTF
|
|
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#define INIT_SZ 128
|
|
|
|
int
|
|
vasprintf(char **str, const char *fmt, va_list ap)
|
|
{
|
|
int ret = -1;
|
|
va_list ap2;
|
|
char *string, *newstr;
|
|
size_t len;
|
|
|
|
VA_COPY(ap2, ap);
|
|
if ((string = malloc(INIT_SZ)) == NULL)
|
|
goto fail;
|
|
|
|
ret = vsnprintf(string, INIT_SZ, fmt, ap2);
|
|
if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
|
|
*str = string;
|
|
} else if (ret == INT_MAX || ret < 0) { /* Bad length */
|
|
free(string);
|
|
goto fail;
|
|
} else { /* bigger than initial, realloc allowing for nul */
|
|
len = (size_t)ret + 1;
|
|
if ((newstr = realloc(string, len)) == NULL) {
|
|
free(string);
|
|
goto fail;
|
|
} else {
|
|
va_end(ap2);
|
|
VA_COPY(ap2, ap);
|
|
ret = vsnprintf(newstr, len, fmt, ap2);
|
|
if (ret >= 0 && (size_t)ret < len) {
|
|
*str = newstr;
|
|
} else { /* failed with realloc'ed string, give up */
|
|
free(newstr);
|
|
goto fail;
|
|
}
|
|
}
|
|
}
|
|
va_end(ap2);
|
|
return (ret);
|
|
|
|
fail:
|
|
*str = NULL;
|
|
errno = ENOMEM;
|
|
va_end(ap2);
|
|
return (-1);
|
|
}
|
|
#endif
|
|
|
|
#ifndef HAVE_ASPRINTF
|
|
int asprintf(char **str, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int ret;
|
|
|
|
*str = NULL;
|
|
va_start(ap, fmt);
|
|
ret = vasprintf(str, fmt, ap);
|
|
va_end(ap);
|
|
|
|
return ret;
|
|
}
|
|
#endif
|