summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshkey.h
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-01-13 07:39:20 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-01-13 07:39:20 +0000
commit1ae6da61073592e059069befb93e33ba7244d3b8 (patch)
treec7fc5914bfc1751484fda664ea49fb7bd57af732 /usr.bin/ssh/sshkey.h
parent0f56f0345e1768c9e992ce67f81db13fa1abcd7d (diff)
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 'usr.bin/ssh/sshkey.h')
-rw-r--r--usr.bin/ssh/sshkey.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshkey.h b/usr.bin/ssh/sshkey.h
index 2db64d76787..f4d7b954a7f 100644
--- a/usr.bin/ssh/sshkey.h
+++ b/usr.bin/ssh/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.3 2015/01/08 10:14:08 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.4 2015/01/13 07:39:19 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -150,7 +150,7 @@ int sshkey_ec_validate_public(const EC_GROUP *, const EC_POINT *);
int sshkey_ec_validate_private(const EC_KEY *);
const char *sshkey_ssh_name(const struct sshkey *);
const char *sshkey_ssh_name_plain(const struct sshkey *);
-int sshkey_names_valid2(const char *);
+int sshkey_names_valid2(const char *, int);
char *key_alg_list(int, int);
int sshkey_from_blob(const u_char *, size_t, struct sshkey **);