38a52bd3b5
Release notes are available at https://www.openssh.com/txt/release-9.1 9.1 contains fixes for three minor memory safety problems; these have lready been merged to the copy of OpenSSH 9.0 that is in the FreeBSD base system. Some highlights copied from the release notes: Potentially-incompatible changes -------------------------------- * ssh(1), sshd(8): SetEnv directives in ssh_config and sshd_config are now first-match-wins to match other directives. Previously if an environment variable was multiply specified the last set value would have been used. bz3438 * ssh-keygen(8): ssh-keygen -A (generate all default host key types) will no longer generate DSA keys, as these are insecure and have not been used by default for some years. New features ------------ * ssh(1), sshd(8): add a RequiredRSASize directive to set a minimum RSA key length. Keys below this length will be ignored for user authentication and for host authentication in sshd(8). * sftp-server(8): add a "users-groups-by-id@openssh.com" extension request that allows the client to obtain user/group names that correspond to a set of uids/gids. * sftp(1): use "users-groups-by-id@openssh.com" sftp-server extension (when available) to fill in user/group names for directory listings. * sftp-server(8): support the "home-directory" extension request defined in draft-ietf-secsh-filexfer-extensions-00. This overlaps a bit with the existing "expand-path@openssh.com", but some other clients support it. * ssh-keygen(1), sshd(8): allow certificate validity intervals, sshsig verification times and authorized_keys expiry-time options to accept dates in the UTC time zone in addition to the default of interpreting them in the system time zone. YYYYMMDD and YYMMDDHHMM[SS] dates/times will be interpreted as UTC if suffixed with a 'Z' character. Also allow certificate validity intervals to be specified in raw seconds-since-epoch as hex value, e.g. -V 0x1234:0x4567890. This is intended for use by regress tests and other tools that call ssh-keygen as part of a CA workflow. bz3468 * sftp(1): allow arguments to the sftp -D option, e.g. sftp -D "/usr/libexec/sftp-server -el debug3" * ssh-keygen(1): allow the existing -U (use agent) flag to work with "-Y sign" operations, where it will be interpreted to require that the private keys is hosted in an agent; bz3429 MFC after: 2 weeks Relnotes: Yes Sponsored by: The FreeBSD Foundation
104 lines
2.9 KiB
C
104 lines
2.9 KiB
C
/* $OpenBSD: sk-api.h,v 1.15 2022/07/20 03:29:14 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 2019 Google LLC
|
|
*
|
|
* 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 _SK_API_H
|
|
#define _SK_API_H 1
|
|
|
|
#include <stddef.h>
|
|
#ifdef HAVE_STDINT_H
|
|
#include <stdint.h>
|
|
#endif
|
|
|
|
/* Flags */
|
|
#define SSH_SK_USER_PRESENCE_REQD 0x01
|
|
#define SSH_SK_USER_VERIFICATION_REQD 0x04
|
|
#define SSH_SK_FORCE_OPERATION 0x10
|
|
#define SSH_SK_RESIDENT_KEY 0x20
|
|
|
|
/* Algs */
|
|
#define SSH_SK_ECDSA 0x00
|
|
#define SSH_SK_ED25519 0x01
|
|
|
|
/* Error codes */
|
|
#define SSH_SK_ERR_GENERAL -1
|
|
#define SSH_SK_ERR_UNSUPPORTED -2
|
|
#define SSH_SK_ERR_PIN_REQUIRED -3
|
|
#define SSH_SK_ERR_DEVICE_NOT_FOUND -4
|
|
#define SSH_SK_ERR_CREDENTIAL_EXISTS -5
|
|
|
|
struct sk_enroll_response {
|
|
uint8_t flags;
|
|
uint8_t *public_key;
|
|
size_t public_key_len;
|
|
uint8_t *key_handle;
|
|
size_t key_handle_len;
|
|
uint8_t *signature;
|
|
size_t signature_len;
|
|
uint8_t *attestation_cert;
|
|
size_t attestation_cert_len;
|
|
uint8_t *authdata;
|
|
size_t authdata_len;
|
|
};
|
|
|
|
struct sk_sign_response {
|
|
uint8_t flags;
|
|
uint32_t counter;
|
|
uint8_t *sig_r;
|
|
size_t sig_r_len;
|
|
uint8_t *sig_s;
|
|
size_t sig_s_len;
|
|
};
|
|
|
|
struct sk_resident_key {
|
|
uint32_t alg;
|
|
size_t slot;
|
|
char *application;
|
|
struct sk_enroll_response key;
|
|
uint8_t flags;
|
|
uint8_t *user_id;
|
|
size_t user_id_len;
|
|
};
|
|
|
|
struct sk_option {
|
|
char *name;
|
|
char *value;
|
|
uint8_t required;
|
|
};
|
|
|
|
#define SSH_SK_VERSION_MAJOR 0x000a0000 /* current API version */
|
|
#define SSH_SK_VERSION_MAJOR_MASK 0xffff0000
|
|
|
|
/* Return the version of the middleware API */
|
|
uint32_t sk_api_version(void);
|
|
|
|
/* Enroll a U2F key (private key generation) */
|
|
int sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
|
|
const char *application, uint8_t flags, const char *pin,
|
|
struct sk_option **options, struct sk_enroll_response **enroll_response);
|
|
|
|
/* Sign a challenge */
|
|
int sk_sign(uint32_t alg, const uint8_t *data, size_t data_len,
|
|
const char *application, const uint8_t *key_handle, size_t key_handle_len,
|
|
uint8_t flags, const char *pin, struct sk_option **options,
|
|
struct sk_sign_response **sign_response);
|
|
|
|
/* Enumerate all resident keys */
|
|
int sk_load_resident_keys(const char *pin, struct sk_option **options,
|
|
struct sk_resident_key ***rks, size_t *nrks);
|
|
|
|
#endif /* _SK_API_H */
|