mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
Ed Maste
2574974648
Full release notes are available at https://www.openssh.com/txt/release-10.3 Selected highlights from the release notes: * ssh(1), sshd(8): remove bug compatibility for implementations that don't support rekeying. If such an implementation tries to interoperate with OpenSSH, it will now eventually fail when the transport needs rekeying. * ssh(1), sshd(8): support IANA-assigned codepoints for SSH agent forwarding, as per draft-ietf-sshm-ssh-agent. Support for the new names is advertised via the EXT_INFO message. If a server offers support for the new names, then they are used preferentially. * ssh(1): add a ~I escape option that shows information about the current SSH connection. * sshd(8): add 'invaliduser' penalty to PerSourcePenalties, which is applied to login attempts for usernames that do not match real accounts. Defaults to 5s to match 'authfail' but allows administrators to block such attempts for longer if desired. * Support the ed25519 signature scheme via libcrypto. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56999
132 lines
3.5 KiB
C
132 lines
3.5 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 */
|
|
if (ssh_libcrypto_init() != 1)
|
|
fatal("libcrypto failed to initialize.");
|
|
|
|
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 */
|
|
|
|
void
|
|
reseed_prngs(void)
|
|
{
|
|
uint32_t rnd[256];
|
|
|
|
#ifdef WITH_OPENSSL
|
|
RAND_poll();
|
|
#endif
|
|
arc4random_stir(); /* noop on recent arc4random() implementations */
|
|
arc4random_buf(rnd, sizeof(rnd)); /* let arc4random notice PID change */
|
|
|
|
#ifdef WITH_OPENSSL
|
|
RAND_seed(rnd, sizeof(rnd));
|
|
/* give libcrypto a chance to notice the PID change */
|
|
if ((RAND_bytes((u_char *)rnd, 1)) != 1)
|
|
fatal_f("RAND_bytes failed");
|
|
#endif
|
|
|
|
explicit_bzero(rnd, sizeof(rnd));
|
|
}
|