summaryrefslogtreecommitdiffstats
path: root/key.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-01-13 07:39:19 +0000
committerDamien Miller <djm@mindrot.org>2015-01-13 19:27:18 +1100
commit1f729f0614d1376c3332fa1edb6a5e5cec7e9e03 (patch)
treef651f10aa00dcecdf8e9362c0abb6282bbc99c95 /key.h
parent816d1538c24209a93ba0560b27c4fda57c3fff65 (diff)
upstream commit
add sshd_config HostbasedAcceptedKeyTypes and PubkeyAcceptedKeyTypes options to allow sshd to control what public key types will be accepted. Currently defaults to all. Feedback & ok markus@
Diffstat (limited to 'key.h')
-rw-r--r--key.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/key.h b/key.h
index 7190b842..bf884970 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.45 2015/01/08 10:14:08 djm Exp $ */
+/* $OpenBSD: key.h,v 1.46 2015/01/13 07:39:19 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -50,7 +50,6 @@ typedef struct sshkey Key;
#define key_size sshkey_size
#define key_ecdsa_bits_to_nid sshkey_ecdsa_bits_to_nid
#define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid
-#define key_names_valid2 sshkey_names_valid2
#define key_is_cert sshkey_is_cert
#define key_type_plain sshkey_type_plain
#define key_cert_is_legacy sshkey_cert_is_legacy