mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-02 08:42:48 +00:00
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
95 lines
3.1 KiB
C
95 lines
3.1 KiB
C
/* $OpenBSD: sshconnect.h,v 1.46 2020/12/22 00:15:23 djm Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2000 Markus Friedl. 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.
|
|
*/
|
|
|
|
typedef struct Sensitive Sensitive;
|
|
struct Sensitive {
|
|
struct sshkey **keys;
|
|
int nkeys;
|
|
};
|
|
|
|
struct ssh_conn_info {
|
|
char *conn_hash_hex;
|
|
char *shorthost;
|
|
char *uidstr;
|
|
char *keyalias;
|
|
char *thishost;
|
|
char *host_arg;
|
|
char *portstr;
|
|
char *remhost;
|
|
char *remuser;
|
|
char *homedir;
|
|
char *locuser;
|
|
};
|
|
|
|
struct addrinfo;
|
|
struct ssh;
|
|
struct hostkeys;
|
|
struct ssh_conn_info;
|
|
|
|
/* default argument for client percent expansions */
|
|
#define DEFAULT_CLIENT_PERCENT_EXPAND_ARGS(conn_info) \
|
|
"C", conn_info->conn_hash_hex, \
|
|
"L", conn_info->shorthost, \
|
|
"i", conn_info->uidstr, \
|
|
"k", conn_info->keyalias, \
|
|
"l", conn_info->thishost, \
|
|
"n", conn_info->host_arg, \
|
|
"p", conn_info->portstr, \
|
|
"d", conn_info->homedir, \
|
|
"h", conn_info->remhost, \
|
|
"r", conn_info->remuser, \
|
|
"u", conn_info->locuser
|
|
|
|
int ssh_connect(struct ssh *, const char *, const char *,
|
|
struct addrinfo *, struct sockaddr_storage *, u_short,
|
|
int, int *, int);
|
|
void ssh_kill_proxy_command(void);
|
|
|
|
void ssh_login(struct ssh *, Sensitive *, const char *,
|
|
struct sockaddr *, u_short, struct passwd *, int,
|
|
const struct ssh_conn_info *);
|
|
|
|
int verify_host_key(char *, struct sockaddr *, struct sshkey *,
|
|
const struct ssh_conn_info *);
|
|
|
|
void get_hostfile_hostname_ipaddr(char *, struct sockaddr *, u_short,
|
|
char **, char **);
|
|
|
|
void ssh_kex2(struct ssh *ssh, char *, struct sockaddr *, u_short,
|
|
const struct ssh_conn_info *);
|
|
|
|
void ssh_userauth2(struct ssh *ssh, const char *, const char *,
|
|
char *, Sensitive *);
|
|
|
|
int ssh_local_cmd(const char *);
|
|
|
|
void maybe_add_key_to_agent(const char *, struct sshkey *,
|
|
const char *, const char *);
|
|
|
|
void load_hostkeys_command(struct hostkeys *, const char *,
|
|
const char *, const struct ssh_conn_info *,
|
|
const struct sshkey *, const char *);
|