diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /sshkey.h | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.44 2019/12/30 09:23:28 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.45 2020/04/08 00:08:46 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. |
@@ -260,6 +260,8 @@ int sshkey_parse_private_fileblob(struct sshbuf *buffer, | |||
260 | const char *passphrase, struct sshkey **keyp, char **commentp); | 260 | const char *passphrase, struct sshkey **keyp, char **commentp); |
261 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, | 261 | int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, |
262 | const char *passphrase, struct sshkey **keyp, char **commentp); | 262 | const char *passphrase, struct sshkey **keyp, char **commentp); |
263 | int sshkey_parse_pubkey_from_private_fileblob_type(struct sshbuf *blob, | ||
264 | int type, struct sshkey **pubkeyp); | ||
263 | 265 | ||
264 | /* XXX should be internal, but used by ssh-keygen */ | 266 | /* XXX should be internal, but used by ssh-keygen */ |
265 | int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *); | 267 | int ssh_rsa_complete_crt_parameters(struct sshkey *, const BIGNUM *); |