mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
535af610a4
Excerpts from the release notes: * ssh-agent(1): PKCS#11 modules must now be specified by their full paths. Previously dlopen(3) could search for them in system library directories. * ssh(1): allow forwarding Unix Domain sockets via ssh -W. * ssh(1): add support for configuration tags to ssh(1). This adds a ssh_config(5) "Tag" directive and corresponding "Match tag" predicate that may be used to select blocks of configuration similar to the pf.conf(5) keywords of the same name. * ssh(1): add a "match localnetwork" predicate. This allows matching on the addresses of available network interfaces and may be used to vary the effective client configuration based on network location. * ssh-agent(1): improve isolation between loaded PKCS#11 modules by running separate ssh-pkcs11-helpers for each loaded provider. * ssh-agent(1), ssh(1): improve defences against invalid PKCS#11 modules being loaded by checking that the requested module contains the required symbol before loading it. * ssh(1): don't incorrectly disable hostname canonicalization when CanonicalizeHostname=yes and ProxyJump was expicitly set to "none". bz3567 Full release notes at https://www.openssh.com/txt/release-9.4 Relnotes: Yes Sponsored by: The FreeBSD Foundation
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 1996, David Mazieres <dm@uun.org>
|
|
* Copyright (c) 2008, Damien Miller <djm@openbsd.org>
|
|
* Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
|
|
*
|
|
* 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"
|
|
|
|
#ifndef SSH_RANDOM_DEV
|
|
# define SSH_RANDOM_DEV "/dev/urandom"
|
|
#endif /* SSH_RANDOM_DEV */
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_RANDOM_H
|
|
# include <sys/random.h>
|
|
#endif
|
|
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#ifdef WITH_OPENSSL
|
|
#include <openssl/rand.h>
|
|
#include <openssl/err.h>
|
|
#endif
|
|
|
|
#include "log.h"
|
|
|
|
int
|
|
_ssh_compat_getentropy(void *s, size_t len)
|
|
{
|
|
#if defined(WITH_OPENSSL) && defined(OPENSSL_PRNG_ONLY)
|
|
if (RAND_bytes(s, len) <= 0)
|
|
fatal("Couldn't obtain random bytes (error 0x%lx)",
|
|
(unsigned long)ERR_get_error());
|
|
#else
|
|
int fd, save_errno;
|
|
ssize_t r;
|
|
size_t o = 0;
|
|
|
|
#ifdef WITH_OPENSSL
|
|
if (RAND_bytes(s, len) == 1)
|
|
return 0;
|
|
#endif
|
|
#ifdef HAVE_GETENTROPY
|
|
if ((r = getentropy(s, len)) == 0)
|
|
return 0;
|
|
#endif /* HAVE_GETENTROPY */
|
|
#ifdef HAVE_GETRANDOM
|
|
if ((r = getrandom(s, len, 0)) > 0 && (size_t)r == len)
|
|
return 0;
|
|
#endif /* HAVE_GETRANDOM */
|
|
|
|
if ((fd = open(SSH_RANDOM_DEV, O_RDONLY)) == -1) {
|
|
save_errno = errno;
|
|
/* Try egd/prngd before giving up. */
|
|
if (seed_from_prngd(s, len) == 0)
|
|
return 0;
|
|
fatal("Couldn't open %s: %s", SSH_RANDOM_DEV,
|
|
strerror(save_errno));
|
|
}
|
|
while (o < len) {
|
|
r = read(fd, (u_char *)s + o, len - o);
|
|
if (r < 0) {
|
|
if (errno == EAGAIN || errno == EINTR ||
|
|
errno == EWOULDBLOCK)
|
|
continue;
|
|
fatal("read %s: %s", SSH_RANDOM_DEV, strerror(errno));
|
|
}
|
|
o += r;
|
|
}
|
|
close(fd);
|
|
#endif /* WITH_OPENSSL */
|
|
return 0;
|
|
}
|