summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-12-15 18:57:30 +0000
committerDamien Miller <djm@mindrot.org>2019-12-16 14:19:41 +1100
commit56584cce75f3d20aaa30befc7cbd331d922927f3 (patch)
treed3e9c2b7c9104b6528758b19eb7fa56dae2fcea6 /servconf.h
parent5af6fd5461bb709304e6979c8b7856c7af921c9e (diff)
upstream: allow security keys to act as host keys as well as user
keys. Previously we didn't do this because we didn't want to expose the attack surface presented by USB and FIDO protocol handling, but now that this is insulated behind ssh-sk-helper there is less risk. ok markus@ OpenBSD-Commit-ID: 77b068dd133b8d87e0f010987bd5131e640ee64c
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 9f202260a..6fc1efb2c 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.141 2019/11/25 00:52:46 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.142 2019/12/15 18:57:30 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -215,6 +215,7 @@ typedef struct {
215 int fingerprint_hash; 215 int fingerprint_hash;
216 int expose_userauth_info; 216 int expose_userauth_info;
217 u_int64_t timing_secret; 217 u_int64_t timing_secret;
218 char *sk_provider;
218} ServerOptions; 219} ServerOptions;
219 220
220/* Information about the incoming connection as used by Match */ 221/* Information about the incoming connection as used by Match */