diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-12 23:31:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-13 09:33:24 +1000 |
commit | 130f5df4fa37cace8c079dccb690e5cafbf00751 (patch) | |
tree | 6be59a00f7c45be11ffc8d40fa79a7c4a57e0a2f /sshkey.h | |
parent | 8f750ccfc07acb8aa98be5a5dd935033a6468cfd (diff) |
upstream commit
list all supported signature algorithms in the
server-sig-algs Reported by mb AT smartftp.com in bz#2547 and (independantly)
Ron Frederick; ok markus@
Upstream-ID: ddf702d721f54646b11ef2cee6d916666cb685cd
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.13 2016/05/02 09:36:42 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.14 2016/09/12 23:31:27 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_private(const EC_KEY *); | |||
156 | const char *sshkey_ssh_name(const struct sshkey *); | 156 | const char *sshkey_ssh_name(const struct sshkey *); |
157 | const char *sshkey_ssh_name_plain(const struct sshkey *); | 157 | const char *sshkey_ssh_name_plain(const struct sshkey *); |
158 | int sshkey_names_valid2(const char *, int); | 158 | int sshkey_names_valid2(const char *, int); |
159 | char *key_alg_list(int, int); | 159 | char *sshkey_alg_list(int, int, char); |
160 | 160 | ||
161 | int sshkey_from_blob(const u_char *, size_t, struct sshkey **); | 161 | int sshkey_from_blob(const u_char *, size_t, struct sshkey **); |
162 | int sshkey_fromb(struct sshbuf *, struct sshkey **); | 162 | int sshkey_fromb(struct sshbuf *, struct sshkey **); |