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
41 lines
1.6 KiB
C
41 lines
1.6 KiB
C
/* $OpenBSD: ssh-pkcs11.h,v 1.6 2020/01/25 00:03:36 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 2010 Markus Friedl. All rights reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
/* Errors for pkcs11_add_provider() */
|
|
#define SSH_PKCS11_ERR_GENERIC 1
|
|
#define SSH_PKCS11_ERR_LOGIN_FAIL 2
|
|
#define SSH_PKCS11_ERR_NO_SLOTS 3
|
|
#define SSH_PKCS11_ERR_PIN_REQUIRED 4
|
|
#define SSH_PKCS11_ERR_PIN_LOCKED 5
|
|
|
|
int pkcs11_init(int);
|
|
void pkcs11_terminate(void);
|
|
int pkcs11_add_provider(char *, char *, struct sshkey ***, char ***);
|
|
int pkcs11_del_provider(char *);
|
|
#ifdef WITH_PKCS11_KEYGEN
|
|
struct sshkey *
|
|
pkcs11_gakp(char *, char *, unsigned int, char *, unsigned int,
|
|
unsigned int, unsigned char, u_int32_t *);
|
|
struct sshkey *
|
|
pkcs11_destroy_keypair(char *, char *, unsigned long, unsigned char,
|
|
u_int32_t *);
|
|
#endif
|
|
|
|
#if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11)
|
|
#undef ENABLE_PKCS11
|
|
#endif
|