diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-03 21:08:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
commit | 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 (patch) | |
tree | b06085d43ce03ece262bea0beb1f4407b312c209 /sshkey.h | |
parent | 1a1b24f8229bf7a21f89df21987433283265527a (diff) |
upstream commit
remove miscellaneous SSH1 leftovers; ok markus@
Upstream-ID: af23696022ae4d45a1abc2fb8b490d8d9dd63b7c
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.16 2017/04/30 23:18:44 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.17 2017/05/03 21:08:09 naddy 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. |
@@ -184,8 +184,6 @@ int sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **keyp); | |||
184 | int sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob, | 184 | int sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob, |
185 | const char *passphrase, const char *comment, | 185 | const char *passphrase, const char *comment, |
186 | int force_new_format, const char *new_format_cipher, int new_format_rounds); | 186 | int force_new_format, const char *new_format_cipher, int new_format_rounds); |
187 | int sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob, | ||
188 | struct sshkey **keyp, char **commentp); | ||
189 | int sshkey_parse_private_fileblob(struct sshbuf *buffer, | 187 | int sshkey_parse_private_fileblob(struct sshbuf *buffer, |
190 | const char *passphrase, struct sshkey **keyp, char **commentp); | 188 | const char *passphrase, struct sshkey **keyp, char **commentp); |
191 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | 189 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, |