summaryrefslogtreecommitdiff
path: root/sshkey.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 /sshkey.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 'sshkey.h')
-rw-r--r--sshkey.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshkey.h b/sshkey.h
index 65194d6e..7217f887 100644
--- a/sshkey.h
+++ b/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.
@@ -156,7 +156,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 **);