summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-25 00:52:46 +0000
committerDamien Miller <djm@mindrot.org>2019-11-25 12:23:40 +1100
commit0fddf2967ac51d518e300408a0d7e6adf4cd2634 (patch)
treed7fe4a4f7cd92c565a765e21b7cb19b9c7544d29 /servconf.h
parentb7e74ea072919b31391bc0f5ff653f80b9f5e84f (diff)
upstream: Add a sshd_config PubkeyAuthOptions directive
This directive has a single valid option "no-touch-required" that causes sshd to skip checking whether user presence was tested before a security key signature was made (usually by the user touching the key). ok markus@ OpenBSD-Commit-ID: 46e434a49802d4ed82bc0aa38cb985c198c407de
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 5483da051..9f202260a 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.140 2019/04/18 18:56:16 dtucker Exp $ */ 1/* $OpenBSD: servconf.h,v 1.141 2019/11/25 00:52:46 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -42,6 +42,9 @@
42/* Magic name for internal sftp-server */ 42/* Magic name for internal sftp-server */
43#define INTERNAL_SFTP_NAME "internal-sftp" 43#define INTERNAL_SFTP_NAME "internal-sftp"
44 44
45/* PubkeyAuthOptions flags */
46#define PUBKEYAUTH_TOUCH_REQUIRED 1
47
45struct ssh; 48struct ssh;
46struct fwd_perm_list; 49struct fwd_perm_list;
47 50
@@ -114,6 +117,7 @@ typedef struct {
114 char *ca_sign_algorithms; /* Allowed CA signature algorithms */ 117 char *ca_sign_algorithms; /* Allowed CA signature algorithms */
115 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ 118 int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
116 char *pubkey_key_types; /* Key types allowed for public key */ 119 char *pubkey_key_types; /* Key types allowed for public key */
120 int pubkey_auth_options; /* -1 or mask of PUBKEYAUTH_* flags */
117 int kerberos_authentication; /* If true, permit Kerberos 121 int kerberos_authentication; /* If true, permit Kerberos
118 * authentication. */ 122 * authentication. */
119 int kerberos_or_local_passwd; /* If true, permit kerberos 123 int kerberos_or_local_passwd; /* If true, permit kerberos