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
171 lines
4.6 KiB
C
171 lines
4.6 KiB
C
/* Based on conf.c from UCB sendmail 8.8.8 */
|
|
|
|
/*
|
|
* Copyright 2003 Damien Miller
|
|
* Copyright (c) 1983, 1995-1997 Eric P. Allman
|
|
* Copyright (c) 1988, 1993
|
|
* The Regents of the University of California. 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.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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"
|
|
|
|
#ifndef HAVE_SETPROCTITLE
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#ifdef HAVE_SYS_PSTAT_H
|
|
#include <sys/pstat.h>
|
|
#endif
|
|
#include <string.h>
|
|
|
|
#include <vis.h>
|
|
|
|
#define SPT_NONE 0 /* don't use it at all */
|
|
#define SPT_PSTAT 1 /* use pstat(PSTAT_SETCMD, ...) */
|
|
#define SPT_REUSEARGV 2 /* cover argv with title information */
|
|
|
|
#ifndef SPT_TYPE
|
|
# define SPT_TYPE SPT_NONE
|
|
#endif
|
|
|
|
#ifndef SPT_PADCHAR
|
|
# define SPT_PADCHAR '\0'
|
|
#endif
|
|
|
|
#if SPT_TYPE == SPT_REUSEARGV
|
|
static char *argv_start = NULL;
|
|
static size_t argv_env_len = 0;
|
|
#endif
|
|
|
|
#endif /* HAVE_SETPROCTITLE */
|
|
|
|
void
|
|
compat_init_setproctitle(int argc, char *argv[])
|
|
{
|
|
#if !defined(HAVE_SETPROCTITLE) && \
|
|
defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
|
|
extern char **environ;
|
|
char *lastargv = NULL;
|
|
char **envp = environ;
|
|
int i;
|
|
|
|
/*
|
|
* NB: This assumes that argv has already been copied out of the
|
|
* way. This is true for sshd, but may not be true for other
|
|
* programs. Beware.
|
|
*/
|
|
|
|
if (argc == 0 || argv[0] == NULL)
|
|
return;
|
|
|
|
/* Fail if we can't allocate room for the new environment */
|
|
for (i = 0; envp[i] != NULL; i++)
|
|
;
|
|
if ((environ = calloc(i + 1, sizeof(*environ))) == NULL) {
|
|
environ = envp; /* put it back */
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Find the last argv string or environment variable within
|
|
* our process memory area.
|
|
*/
|
|
for (i = 0; i < argc; i++) {
|
|
if (lastargv == NULL || lastargv + 1 == argv[i])
|
|
lastargv = argv[i] + strlen(argv[i]);
|
|
}
|
|
for (i = 0; envp[i] != NULL; i++) {
|
|
if (lastargv + 1 == envp[i])
|
|
lastargv = envp[i] + strlen(envp[i]);
|
|
}
|
|
|
|
argv[1] = NULL;
|
|
argv_start = argv[0];
|
|
argv_env_len = lastargv - argv[0] - 1;
|
|
|
|
/*
|
|
* Copy environment
|
|
* XXX - will truncate env on strdup fail
|
|
*/
|
|
for (i = 0; envp[i] != NULL; i++)
|
|
environ[i] = strdup(envp[i]);
|
|
environ[i] = NULL;
|
|
#endif /* SPT_REUSEARGV */
|
|
}
|
|
|
|
#ifndef HAVE_SETPROCTITLE
|
|
void
|
|
setproctitle(const char *fmt, ...)
|
|
{
|
|
#if SPT_TYPE != SPT_NONE
|
|
va_list ap;
|
|
char buf[1024], ptitle[1024];
|
|
size_t len = 0;
|
|
int r;
|
|
extern char *__progname;
|
|
#if SPT_TYPE == SPT_PSTAT
|
|
union pstun pst;
|
|
#endif
|
|
|
|
#if SPT_TYPE == SPT_REUSEARGV
|
|
if (argv_env_len <= 0)
|
|
return;
|
|
#endif
|
|
|
|
strlcpy(buf, __progname, sizeof(buf));
|
|
|
|
r = -1;
|
|
va_start(ap, fmt);
|
|
if (fmt != NULL) {
|
|
len = strlcat(buf, ": ", sizeof(buf));
|
|
if (len < sizeof(buf))
|
|
r = vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
|
|
}
|
|
va_end(ap);
|
|
if (r == -1 || (size_t)r >= sizeof(buf) - len)
|
|
return;
|
|
strnvis(ptitle, buf, sizeof(ptitle),
|
|
VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL);
|
|
|
|
#if SPT_TYPE == SPT_PSTAT
|
|
pst.pst_command = ptitle;
|
|
pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0);
|
|
#elif SPT_TYPE == SPT_REUSEARGV
|
|
/* debug("setproctitle: copy \"%s\" into len %d",
|
|
buf, argv_env_len); */
|
|
len = strlcpy(argv_start, ptitle, argv_env_len);
|
|
for(; len < argv_env_len; len++)
|
|
argv_start[len] = SPT_PADCHAR;
|
|
#endif
|
|
|
|
#endif /* SPT_NONE */
|
|
}
|
|
|
|
#endif /* HAVE_SETPROCTITLE */
|