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 /sshkey.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 'sshkey.h')
-rw-r--r-- | sshkey.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.3 2015/01/08 10:14:08 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.4 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. |
@@ -156,7 +156,7 @@ int sshkey_ec_validate_public(const EC_GROUP *, const EC_POINT *); | |||
156 | int sshkey_ec_validate_private(const EC_KEY *); | 156 | int sshkey_ec_validate_private(const EC_KEY *); |
157 | const char *sshkey_ssh_name(const struct sshkey *); | 157 | const char *sshkey_ssh_name(const struct sshkey *); |
158 | const char *sshkey_ssh_name_plain(const struct sshkey *); | 158 | const char *sshkey_ssh_name_plain(const struct sshkey *); |
159 | int sshkey_names_valid2(const char *); | 159 | int sshkey_names_valid2(const char *, int); |
160 | char *key_alg_list(int, int); | 160 | char *key_alg_list(int, int); |
161 | 161 | ||
162 | int sshkey_from_blob(const u_char *, size_t, struct sshkey **); | 162 | int sshkey_from_blob(const u_char *, size_t, struct sshkey **); |