summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2006-04-02 08:34:53 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2006-04-02 08:34:53 +0000
commit8f7824760ff990c78b2593562442d5bfa7b24669 (patch)
treefb88f80ec4d48598dfc10f8afd24595f22e0f214 /usr.bin
parenta35a024b5601416bc775d7d2b89fa8d7eea80990 (diff)
sessionid can be 32 bytes now too when sha256 kex is used; ok djm@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh-keysign.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c
index f9c6a1d773a..63d856b979b 100644
--- a/usr.bin/ssh/ssh-keysign.c
+++ b/usr.bin/ssh/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.22 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.23 2006/04/02 08:34:52 dtucker Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -64,9 +64,9 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
buffer_init(&b);
buffer_append(&b, data, datalen);
- /* session id, currently limited to SHA1 (20 bytes) */
+ /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
p = buffer_get_string(&b, &len);
- if (len != 20)
+ if (len != 20 && len != 32)
fail++;
xfree(p);