summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-03-29 01:35:00 +0100
committerColin Watson <cjwatson@debian.org>2017-03-29 01:35:00 +0100
commit6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (patch)
treeb4377d09196e24e2c6f2c2128f66f92cf7891105 /sshkey.h
parent971a7653746a6972b907dfe0ce139c06e4a6f482 (diff)
parentd38f05dbdd291212bc95ea80648b72b7177e9f4e (diff)
Import openssh_7.5p1.orig.tar.gz
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 f39363842..1b9e42f45 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.h,v 1.14 2016/09/12 23:31:27 djm Exp $ */ 1/* $OpenBSD: sshkey.h,v 1.15 2017/03/10 04:07:20 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 *);
156const char *sshkey_ssh_name(const struct sshkey *); 156const char *sshkey_ssh_name(const struct sshkey *);
157const char *sshkey_ssh_name_plain(const struct sshkey *); 157const char *sshkey_ssh_name_plain(const struct sshkey *);
158int sshkey_names_valid2(const char *, int); 158int sshkey_names_valid2(const char *, int);
159char *sshkey_alg_list(int, int, char); 159char *sshkey_alg_list(int, int, int, char);
160 160
161int sshkey_from_blob(const u_char *, size_t, struct sshkey **); 161int sshkey_from_blob(const u_char *, size_t, struct sshkey **);
162int sshkey_fromb(struct sshbuf *, struct sshkey **); 162int sshkey_fromb(struct sshbuf *, struct sshkey **);