From 5fe9ca7d8cb6ef035141bf904b30f3b656bb2d73 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sun, 23 Apr 2006 02:05:32 +0000
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2006/04/02 08:34:52     
 [ssh-keysign.c]      sessionid can be 32 bytes now too when sha256 kex is
 used; ok djm@

---
 ChangeLog     | 6 ++++++
 ssh-keysign.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78fafbb8..359b003a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
    - djm@cvs.openbsd.org 2006/04/01 05:50:29
      [scp.c]
      xasprintification; ok deraadt@
+   - djm@cvs.openbsd.org 2006/04/01 05:51:34
+     [atomicio.c]
+     ANSIfy; requested deraadt@
+   - dtucker@cvs.openbsd.org 2006/04/02 08:34:52
+     [ssh-keysign.c]
+     sessionid can be 32 bytes now too when sha256 kex is used; ok djm@
 
 20060421
  - (djm) [Makefile.in configure.ac session.c sshpty.c]
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 1f78c7a0..017af530 100644
--- a/ssh-keysign.c
+++ b/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.
  *
@@ -68,9 +68,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);
 
-- 
2.45.1