summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-06-23 12:21:46 +0000
committerDamien Miller <djm@mindrot.org>2019-06-23 22:22:42 +1000
commit8de52eb224143783a49f9bddd9ab7800022a8276 (patch)
tree7f71d2ef166ba4bc1dbea40804633146ec8e8d6e
parent1dfadb9b57c2985c95838a0292d1c2f6a501896e (diff)
upstream: fix mismatch proto/decl from key shielding change; spotted
via oss-fuzz OpenBSD-Commit-ID: 1ea0ba05ded2c5557507bd844cd446e5c8b5b3b7
-rw-r--r--sshkey.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshkey.c b/sshkey.c
index 7aa7e772c..a545b42ca 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.c,v 1.76 2019/06/21 04:21:05 djm Exp $ */ 1/* $OpenBSD: sshkey.c,v 1.77 2019/06/23 12:21:46 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved. 4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -4313,7 +4313,7 @@ sshkey_parse_private_fileblob(struct sshbuf *buffer, const char *passphrase,
4313 * maxsign times. 4313 * maxsign times.
4314 */ 4314 */
4315int 4315int
4316sshkey_private_serialize_maxsign(const struct sshkey *k, struct sshbuf *b, 4316sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b,
4317 u_int32_t maxsign, sshkey_printfn *pr) 4317 u_int32_t maxsign, sshkey_printfn *pr)
4318{ 4318{
4319 int r, rupdate; 4319 int r, rupdate;