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
61 lines
2.2 KiB
C
61 lines
2.2 KiB
C
/*
|
|
* Copyright (c) 2004,2005 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.
|
|
*/
|
|
|
|
/* Address handling routines */
|
|
|
|
#ifndef _ADDR_H
|
|
#define _ADDR_H
|
|
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
|
|
struct xaddr {
|
|
sa_family_t af;
|
|
union {
|
|
struct in_addr v4;
|
|
struct in6_addr v6;
|
|
u_int8_t addr8[16];
|
|
u_int16_t addr16[8];
|
|
u_int32_t addr32[4];
|
|
} xa; /* 128-bit address */
|
|
u_int32_t scope_id; /* iface scope id for v6 */
|
|
#define v4 xa.v4
|
|
#define v6 xa.v6
|
|
#define addr8 xa.addr8
|
|
#define addr16 xa.addr16
|
|
#define addr32 xa.addr32
|
|
};
|
|
|
|
int addr_unicast_masklen(int af);
|
|
int addr_xaddr_to_sa(const struct xaddr *xa, struct sockaddr *sa,
|
|
socklen_t *len, u_int16_t port);
|
|
int addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa);
|
|
int addr_netmask(int af, u_int l, struct xaddr *n);
|
|
int addr_hostmask(int af, u_int l, struct xaddr *n);
|
|
int addr_invert(struct xaddr *n);
|
|
int addr_pton(const char *p, struct xaddr *n);
|
|
int addr_sa_pton(const char *h, const char *s, struct sockaddr *sa,
|
|
socklen_t slen);
|
|
int addr_pton_cidr(const char *p, struct xaddr *n, u_int *l);
|
|
int addr_ntop(const struct xaddr *n, char *p, size_t len);
|
|
int addr_and(struct xaddr *dst, const struct xaddr *a, const struct xaddr *b);
|
|
int addr_cmp(const struct xaddr *a, const struct xaddr *b);
|
|
int addr_is_all0s(const struct xaddr *n);
|
|
int addr_host_is_all0s(const struct xaddr *n, u_int masklen);
|
|
int addr_netmatch(const struct xaddr *host, const struct xaddr *net,
|
|
u_int masklen);
|
|
#endif /* _ADDR_H */
|