diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-10-19 22:49:23 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-10-20 10:15:02 +1100 |
| commit | eab2888cfc6cc4e2ef24bd017da9835a0f365f3f (patch) | |
| tree | 0e714820d6f3995d7720e77aaa573892d1499dc0 /sshkey.c | |
| parent | f7bd11e4941620991f3e727cd0131b01f0311a58 (diff) | |
| download | openssh-git-eab2888cfc6cc4e2ef24bd017da9835a0f365f3f.tar.gz | |
upstream: Adapt XMSS to new logging infrastructure. With markus@, ok
djm@.
OpenBSD-Commit-ID: 9c35ec3aa0f710e4e3325187ceff4fa3791686de
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.111 2020/08/27 01:06:19 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.112 2020/10/19 22:49:23 dtucker Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -4700,7 +4700,7 @@ sshkey_parse_pubkey_from_private_fileblob_type(struct sshbuf *blob, int type, */ int sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b, - u_int32_t maxsign, sshkey_printfn *pr) + u_int32_t maxsign, int printerror) { int r, rupdate; @@ -4708,14 +4708,14 @@ sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b, sshkey_type_plain(k->type) != KEY_XMSS) return sshkey_private_serialize_opt(k, b, SSHKEY_SERIALIZE_DEFAULT); - if ((r = sshkey_xmss_get_state(k, pr)) != 0 || + if ((r = sshkey_xmss_get_state(k, printerror)) != 0 || (r = sshkey_private_serialize_opt(k, b, SSHKEY_SERIALIZE_STATE)) != 0 || (r = sshkey_xmss_forward_state(k, maxsign)) != 0) goto out; r = 0; out: - if ((rupdate = sshkey_xmss_update_state(k, pr)) != 0) { + if ((rupdate = sshkey_xmss_update_state(k, printerror)) != 0) { if (r == 0) r = rupdate; } @@ -4754,7 +4754,7 @@ sshkey_set_filename(struct sshkey *k, const char *filename) #else int sshkey_private_serialize_maxsign(struct sshkey *k, struct sshbuf *b, - u_int32_t maxsign, sshkey_printfn *pr) + u_int32_t maxsign, int printerror) { return sshkey_private_serialize_opt(k, b, SSHKEY_SERIALIZE_DEFAULT); } |