diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-13 07:39:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-13 19:27:18 +1100 |
commit | 1f729f0614d1376c3332fa1edb6a5e5cec7e9e03 (patch) | |
tree | f651f10aa00dcecdf8e9362c0abb6282bbc99c95 /key.h | |
parent | 816d1538c24209a93ba0560b27c4fda57c3fff65 (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.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.h,v 1.45 2015/01/08 10:14:08 djm Exp $ */ | 1 | /* $OpenBSD: key.h,v 1.46 2015/01/13 07:39:19 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -50,7 +50,6 @@ typedef struct sshkey Key; | |||
50 | #define key_size sshkey_size | 50 | #define key_size sshkey_size |
51 | #define key_ecdsa_bits_to_nid sshkey_ecdsa_bits_to_nid | 51 | #define key_ecdsa_bits_to_nid sshkey_ecdsa_bits_to_nid |
52 | #define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid | 52 | #define key_ecdsa_key_to_nid sshkey_ecdsa_key_to_nid |
53 | #define key_names_valid2 sshkey_names_valid2 | ||
54 | #define key_is_cert sshkey_is_cert | 53 | #define key_is_cert sshkey_is_cert |
55 | #define key_type_plain sshkey_type_plain | 54 | #define key_type_plain sshkey_type_plain |
56 | #define key_cert_is_legacy sshkey_cert_is_legacy | 55 | #define key_cert_is_legacy sshkey_cert_is_legacy |