diff options
author | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
commit | 7c07891caf91823c65d0ed7f700a1cfe983e15cc (patch) | |
tree | fb276a713da5dc24fdafffe04d15c0de14e138e2 /crypto/openssh/hostfile.c | |
parent | c2efe9a3053e865e5c7bf36de808ec154ddb8c36 (diff) | |
download | FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.zip FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.tar.gz |
Merge conflicts.
Diffstat (limited to 'crypto/openssh/hostfile.c')
-rw-r--r-- | crypto/openssh/hostfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/hostfile.c b/crypto/openssh/hostfile.c index 63550a2..3ed6462 100644 --- a/crypto/openssh/hostfile.c +++ b/crypto/openssh/hostfile.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $"); +RCSID("$OpenBSD: hostfile.c,v 1.36 2005/11/22 03:36:03 dtucker Exp $"); #include <resolv.h> #include <openssl/hmac.h> @@ -88,8 +88,8 @@ extract_salt(const char *s, u_int l, char *salt, size_t salt_len) return (-1); } if (ret != SHA_DIGEST_LENGTH) { - debug2("extract_salt: expected salt len %u, got %u", - salt_len, ret); + debug2("extract_salt: expected salt len %d, got %d", + SHA_DIGEST_LENGTH, ret); return (-1); } |