upstream commit

fix format strings in (disabled) debugging
This commit is contained in:
djm@openbsd.org 2015-01-19 17:35:48 +00:00 committed by Damien Miller
parent d85e062459
commit 4e62cc68ce

8
krl.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: krl.c,v 1.27 2015/01/18 14:01:00 deraadt Exp $ */ /* $OpenBSD: krl.c,v 1.28 2015/01/19 17:35:48 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -736,7 +736,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
/* Finally, output sections for revocations by public key/hash */ /* Finally, output sections for revocations by public key/hash */
sshbuf_reset(sect); sshbuf_reset(sect);
RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_keys) { RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_keys) {
KRL_DBG(("%s: key len %u ", __func__, rb->len)); KRL_DBG(("%s: key len %zu ", __func__, rb->len));
if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0) if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
goto out; goto out;
} }
@ -747,7 +747,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
} }
sshbuf_reset(sect); sshbuf_reset(sect);
RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_sha1s) { RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_sha1s) {
KRL_DBG(("%s: hash len %u ", __func__, rb->len)); KRL_DBG(("%s: hash len %zu ", __func__, rb->len));
if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0) if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
goto out; goto out;
} }
@ -772,7 +772,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
if ((r = sshkey_sign(sign_keys[i], &sblob, &slen, if ((r = sshkey_sign(sign_keys[i], &sblob, &slen,
sshbuf_ptr(buf), sshbuf_len(buf), 0)) == -1) sshbuf_ptr(buf), sshbuf_len(buf), 0)) == -1)
goto out; goto out;
KRL_DBG(("%s: signature sig len %u", __func__, slen)); KRL_DBG(("%s: signature sig len %zu", __func__, slen));
if ((r = sshbuf_put_string(buf, sblob, slen)) != 0) if ((r = sshbuf_put_string(buf, sblob, slen)) != 0)
goto out; goto out;
} }