mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-08 20:26:31 +00:00
f374ba41f5
Release notes are available at https://www.openssh.com/txt/release-9.2 OpenSSH 9.2 contains fixes for two security problems and a memory safety problem. The memory safety problem is not believed to be exploitable. These fixes have already been committed to OpenSSH 9.1 in FreeBSD. Some other notable items from the release notes: * ssh(1): add a new EnableEscapeCommandline ssh_config(5) option that controls whether the client-side ~C escape sequence that provides a command-line is available. Among other things, the ~C command-line could be used to add additional port-forwards at runtime. * sshd(8): add support for channel inactivity timeouts via a new sshd_config(5) ChannelTimeout directive. This allows channels that have not seen traffic in a configurable interval to be automatically closed. Different timeouts may be applied to session, X11, agent and TCP forwarding channels. * sshd(8): add a sshd_config UnusedConnectionTimeout option to terminate client connections that have no open channels for a length of time. This complements the ChannelTimeout option above. * sshd(8): add a -V (version) option to sshd like the ssh client has. * scp(1), sftp(1): add a -X option to both scp(1) and sftp(1) to allow control over some SFTP protocol parameters: the copy buffer length and the number of in-flight requests, both of which are used during upload/download. Previously these could be controlled in sftp(1) only. This makes them available in both SFTP protocol clients using the same option character sequence. * ssh-keyscan(1): allow scanning of complete CIDR address ranges, e.g. "ssh-keyscan 192.168.0.0/24". If a CIDR range is passed, then it will be expanded to all possible addresses in the range including the all-0s and all-1s addresses. bz#976 * ssh(1): support dynamic remote port forwarding in escape command-line's -R processing. bz#3499 MFC after: 1 week Sponsored by: The FreeBSD Foundation
110 lines
3.0 KiB
C
110 lines
3.0 KiB
C
/*
|
|
* Copyright (c) 2001 Damien Miller. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#define RANDOM_SEED_SIZE 48
|
|
|
|
#ifdef WITH_OPENSSL
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <openssl/rand.h>
|
|
#include <openssl/crypto.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "openbsd-compat/openssl-compat.h"
|
|
|
|
#include "ssh.h"
|
|
#include "misc.h"
|
|
#include "xmalloc.h"
|
|
#include "atomicio.h"
|
|
#include "pathnames.h"
|
|
#include "log.h"
|
|
#include "sshbuf.h"
|
|
#include "ssherr.h"
|
|
|
|
/*
|
|
* Portable OpenSSH PRNG seeding:
|
|
* If OpenSSL has not "internally seeded" itself (e.g. pulled data from
|
|
* /dev/random), then collect RANDOM_SEED_SIZE bytes of randomness from
|
|
* PRNGd.
|
|
*/
|
|
|
|
void
|
|
seed_rng(void)
|
|
{
|
|
unsigned char buf[RANDOM_SEED_SIZE];
|
|
|
|
/* Initialise libcrypto */
|
|
ssh_libcrypto_init();
|
|
|
|
if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER,
|
|
OpenSSL_version_num()))
|
|
fatal("OpenSSL version mismatch. Built against %lx, you "
|
|
"have %lx", (u_long)OPENSSL_VERSION_NUMBER,
|
|
OpenSSL_version_num());
|
|
|
|
#ifndef OPENSSL_PRNG_ONLY
|
|
if (RAND_status() == 1)
|
|
debug3("RNG is ready, skipping seeding");
|
|
else {
|
|
if (seed_from_prngd(buf, sizeof(buf)) == -1)
|
|
fatal("Could not obtain seed from PRNGd");
|
|
RAND_add(buf, sizeof(buf), sizeof(buf));
|
|
}
|
|
#endif /* OPENSSL_PRNG_ONLY */
|
|
|
|
if (RAND_status() != 1)
|
|
fatal("PRNG is not seeded");
|
|
|
|
/* Ensure arc4random() is primed */
|
|
arc4random_buf(buf, sizeof(buf));
|
|
explicit_bzero(buf, sizeof(buf));
|
|
}
|
|
|
|
#else /* WITH_OPENSSL */
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
/* Actual initialisation is handled in arc4random() */
|
|
void
|
|
seed_rng(void)
|
|
{
|
|
unsigned char buf[RANDOM_SEED_SIZE];
|
|
|
|
/* Ensure arc4random() is primed */
|
|
arc4random_buf(buf, sizeof(buf));
|
|
explicit_bzero(buf, sizeof(buf));
|
|
}
|
|
|
|
#endif /* WITH_OPENSSL */
|