mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-08 20:26:31 +00:00
535af610a4
Excerpts from the release notes: * ssh-agent(1): PKCS#11 modules must now be specified by their full paths. Previously dlopen(3) could search for them in system library directories. * ssh(1): allow forwarding Unix Domain sockets via ssh -W. * ssh(1): add support for configuration tags to ssh(1). This adds a ssh_config(5) "Tag" directive and corresponding "Match tag" predicate that may be used to select blocks of configuration similar to the pf.conf(5) keywords of the same name. * ssh(1): add a "match localnetwork" predicate. This allows matching on the addresses of available network interfaces and may be used to vary the effective client configuration based on network location. * ssh-agent(1): improve isolation between loaded PKCS#11 modules by running separate ssh-pkcs11-helpers for each loaded provider. * ssh-agent(1), ssh(1): improve defences against invalid PKCS#11 modules being loaded by checking that the requested module contains the required symbol before loading it. * ssh(1): don't incorrectly disable hostname canonicalization when CanonicalizeHostname=yes and ProxyJump was expicitly set to "none". bz3567 Full release notes at https://www.openssh.com/txt/release-9.4 Relnotes: Yes Sponsored by: The FreeBSD Foundation
68 lines
2.7 KiB
C
68 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2012 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.
|
|
*/
|
|
|
|
/* $OpenBSD: krl.h,v 1.10 2023/07/17 04:01:10 djm Exp $ */
|
|
|
|
#ifndef _KRL_H
|
|
#define _KRL_H
|
|
|
|
/* Functions to manage key revocation lists */
|
|
|
|
#define KRL_MAGIC "SSHKRL\n\0"
|
|
#define KRL_FORMAT_VERSION 1
|
|
|
|
/* KRL section types */
|
|
#define KRL_SECTION_CERTIFICATES 1
|
|
#define KRL_SECTION_EXPLICIT_KEY 2
|
|
#define KRL_SECTION_FINGERPRINT_SHA1 3
|
|
#define KRL_SECTION_SIGNATURE 4
|
|
#define KRL_SECTION_FINGERPRINT_SHA256 5
|
|
#define KRL_SECTION_EXTENSION 255
|
|
|
|
/* KRL_SECTION_CERTIFICATES subsection types */
|
|
#define KRL_SECTION_CERT_SERIAL_LIST 0x20
|
|
#define KRL_SECTION_CERT_SERIAL_RANGE 0x21
|
|
#define KRL_SECTION_CERT_SERIAL_BITMAP 0x22
|
|
#define KRL_SECTION_CERT_KEY_ID 0x23
|
|
#define KRL_SECTION_CERT_EXTENSION 0x39
|
|
|
|
struct sshkey;
|
|
struct sshbuf;
|
|
struct ssh_krl;
|
|
|
|
struct ssh_krl *ssh_krl_init(void);
|
|
void ssh_krl_free(struct ssh_krl *krl);
|
|
void ssh_krl_set_version(struct ssh_krl *krl, u_int64_t version);
|
|
int ssh_krl_set_comment(struct ssh_krl *krl, const char *comment);
|
|
int ssh_krl_revoke_cert_by_serial(struct ssh_krl *krl,
|
|
const struct sshkey *ca_key, u_int64_t serial);
|
|
int ssh_krl_revoke_cert_by_serial_range(struct ssh_krl *krl,
|
|
const struct sshkey *ca_key, u_int64_t lo, u_int64_t hi);
|
|
int ssh_krl_revoke_cert_by_key_id(struct ssh_krl *krl,
|
|
const struct sshkey *ca_key, const char *key_id);
|
|
int ssh_krl_revoke_key_explicit(struct ssh_krl *krl, const struct sshkey *key);
|
|
int ssh_krl_revoke_key_sha1(struct ssh_krl *krl, const u_char *p, size_t len);
|
|
int ssh_krl_revoke_key_sha256(struct ssh_krl *krl, const u_char *p, size_t len);
|
|
int ssh_krl_revoke_key(struct ssh_krl *krl, const struct sshkey *key);
|
|
int ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf);
|
|
int ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp);
|
|
int ssh_krl_check_key(struct ssh_krl *krl, const struct sshkey *key);
|
|
int ssh_krl_file_contains_key(const char *path, const struct sshkey *key);
|
|
int krl_dump(struct ssh_krl *krl, FILE *f);
|
|
|
|
#endif /* _KRL_H */
|
|
|