317a38ab65
Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985 (cherry picked from commit19261079b7) (cherry picked from commitf448c3ed4a) (cherry picked from commit1f290c707a) (cherry picked from commit0f9bafdfc3) (cherry picked from commitadb56e58e8) (cherry picked from commit576b58108c) (cherry picked from commit1c99af1ebe) (cherry picked from commit87152f3405) (cherry picked from commit172fa4aa75)
98 lines
2.8 KiB
C
98 lines
2.8 KiB
C
/*-
|
|
* Copyright (c) 2015 The NetBSD Foundation, Inc.
|
|
* Copyright (c) 2016 The FreeBSD Foundation, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Portions of this software were developed by Kurt Lidl
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
* by Christos Zoulas.
|
|
*
|
|
* 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
* ``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 FOUNDATION OR CONTRIBUTORS
|
|
* 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"
|
|
|
|
#include <ctype.h>
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <syslog.h>
|
|
#include <unistd.h>
|
|
|
|
#include "ssh.h"
|
|
#include "packet.h"
|
|
#include "log.h"
|
|
#include "misc.h"
|
|
#include "servconf.h"
|
|
#include <blacklist.h>
|
|
#include "blacklist_client.h"
|
|
|
|
static struct blacklist *blstate = NULL;
|
|
|
|
/* import */
|
|
extern ServerOptions options;
|
|
|
|
/* internal definition from bl.h */
|
|
struct blacklist *bl_create(bool, char *, void (*)(int, const char *, va_list));
|
|
|
|
/* impedence match vsyslog() to sshd's internal logging levels */
|
|
void
|
|
im_log(int priority, const char *message, va_list args)
|
|
{
|
|
LogLevel imlevel;
|
|
|
|
switch (priority) {
|
|
case LOG_ERR:
|
|
imlevel = SYSLOG_LEVEL_ERROR;
|
|
break;
|
|
case LOG_DEBUG:
|
|
imlevel = SYSLOG_LEVEL_DEBUG1;
|
|
break;
|
|
case LOG_INFO:
|
|
imlevel = SYSLOG_LEVEL_INFO;
|
|
break;
|
|
default:
|
|
imlevel = SYSLOG_LEVEL_DEBUG2;
|
|
}
|
|
do_log2(imlevel, message, args);
|
|
}
|
|
|
|
void
|
|
blacklist_init(void)
|
|
{
|
|
|
|
if (options.use_blacklist)
|
|
blstate = bl_create(false, NULL, im_log);
|
|
}
|
|
|
|
void
|
|
blacklist_notify(struct ssh *ssh, int action, const char *msg)
|
|
{
|
|
|
|
if (blstate != NULL && ssh_packet_connection_is_on_socket(ssh))
|
|
(void)blacklist_r(blstate, action,
|
|
ssh_packet_get_connection_in(ssh), msg);
|
|
}
|