19261079b7
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
99 lines
2.4 KiB
C
99 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2012 Darren Tucker (dtucker at zip com au).
|
|
*
|
|
* 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"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdarg.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include "log.h"
|
|
|
|
#if !defined(HAVE_SETRESGID) || defined(BROKEN_SETRESGID)
|
|
int
|
|
setresgid(gid_t rgid, gid_t egid, gid_t sgid)
|
|
{
|
|
int ret = 0, saved_errno;
|
|
|
|
if (rgid != sgid) {
|
|
errno = ENOSYS;
|
|
return -1;
|
|
}
|
|
#if defined(HAVE_SETREGID) && !defined(BROKEN_SETREGID)
|
|
if (setregid(rgid, egid) < 0) {
|
|
saved_errno = errno;
|
|
error("setregid %lu: %.100s", (u_long)rgid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
#else
|
|
if (setegid(egid) < 0) {
|
|
saved_errno = errno;
|
|
error("setegid %lu: %.100s", (u_long)egid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
if (setgid(rgid) < 0) {
|
|
saved_errno = errno;
|
|
error("setgid %lu: %.100s", (u_long)rgid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
#endif
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
#if !defined(HAVE_SETRESUID) || defined(BROKEN_SETRESUID)
|
|
int
|
|
setresuid(uid_t ruid, uid_t euid, uid_t suid)
|
|
{
|
|
int ret = 0, saved_errno;
|
|
|
|
if (ruid != suid) {
|
|
errno = ENOSYS;
|
|
return -1;
|
|
}
|
|
#if defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
|
|
if (setreuid(ruid, euid) < 0) {
|
|
saved_errno = errno;
|
|
error("setreuid %lu: %.100s", (u_long)ruid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
#else
|
|
|
|
# ifndef SETEUID_BREAKS_SETUID
|
|
if (seteuid(euid) < 0) {
|
|
saved_errno = errno;
|
|
error("seteuid %lu: %.100s", (u_long)euid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
# endif
|
|
if (setuid(ruid) < 0) {
|
|
saved_errno = errno;
|
|
error("setuid %lu: %.100s", (u_long)ruid, strerror(errno));
|
|
errno = saved_errno;
|
|
ret = -1;
|
|
}
|
|
#endif
|
|
return ret;
|
|
}
|
|
#endif
|