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
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/* $OpenBSD: auth-options.h,v 1.31 2021/07/23 03:57:20 djm Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2018 Damien Miller <djm@mindrot.org>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef AUTH_OPTIONS_H
|
|
#define AUTH_OPTIONS_H
|
|
|
|
struct passwd;
|
|
struct sshkey;
|
|
|
|
/* Maximum number of permitopen/permitlisten directives to accept */
|
|
#define SSH_AUTHOPT_PERMIT_MAX 4096
|
|
|
|
/* Maximum number of environment directives to accept */
|
|
#define SSH_AUTHOPT_ENV_MAX 1024
|
|
|
|
/*
|
|
* sshauthopt represents key options parsed from authorized_keys or
|
|
* from certificate extensions/options.
|
|
*/
|
|
struct sshauthopt {
|
|
/* Feature flags */
|
|
int permit_port_forwarding_flag;
|
|
int permit_agent_forwarding_flag;
|
|
int permit_x11_forwarding_flag;
|
|
int permit_pty_flag;
|
|
int permit_user_rc;
|
|
|
|
/* "restrict" keyword was invoked */
|
|
int restricted;
|
|
|
|
/* key/principal expiry date */
|
|
uint64_t valid_before;
|
|
|
|
/* Certificate-related options */
|
|
int cert_authority;
|
|
char *cert_principals;
|
|
|
|
int force_tun_device;
|
|
char *force_command;
|
|
|
|
/* Custom environment */
|
|
size_t nenv;
|
|
char **env;
|
|
|
|
/* Permitted port forwardings */
|
|
size_t npermitopen;
|
|
char **permitopen;
|
|
|
|
/* Permitted listens (remote forwarding) */
|
|
size_t npermitlisten;
|
|
char **permitlisten;
|
|
|
|
/*
|
|
* Permitted host/addresses (comma-separated)
|
|
* Caller must check source address matches both lists (if present).
|
|
*/
|
|
char *required_from_host_cert;
|
|
char *required_from_host_keys;
|
|
|
|
/* Key requires user presence asserted */
|
|
int no_require_user_presence;
|
|
/* Key requires user verification (e.g. PIN) */
|
|
int require_verify;
|
|
};
|
|
|
|
struct sshauthopt *sshauthopt_new(void);
|
|
struct sshauthopt *sshauthopt_new_with_keys_defaults(void);
|
|
void sshauthopt_free(struct sshauthopt *opts);
|
|
struct sshauthopt *sshauthopt_copy(const struct sshauthopt *orig);
|
|
int sshauthopt_serialise(const struct sshauthopt *opts, struct sshbuf *m, int);
|
|
int sshauthopt_deserialise(struct sshbuf *m, struct sshauthopt **opts);
|
|
|
|
/*
|
|
* Parse authorized_keys options. Returns an options structure on success
|
|
* or NULL on failure. Will set errstr on failure.
|
|
*/
|
|
struct sshauthopt *sshauthopt_parse(const char *s, const char **errstr);
|
|
|
|
/*
|
|
* Parse certification options to a struct sshauthopt.
|
|
* Returns options on success or NULL on failure.
|
|
*/
|
|
struct sshauthopt *sshauthopt_from_cert(struct sshkey *k);
|
|
|
|
/*
|
|
* Merge key options.
|
|
*/
|
|
struct sshauthopt *sshauthopt_merge(const struct sshauthopt *primary,
|
|
const struct sshauthopt *additional, const char **errstrp);
|
|
|
|
#endif
|