summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-04-23 12:05:32 +1000
committerDamien Miller <djm@mindrot.org>2006-04-23 12:05:32 +1000
commit603e68f1a29c954f0c08a08b3f429956008ac244 (patch)
tree3318c09630bf821789dffe2ee68e3fc062d6b718 /ssh-keysign.c
parent3db78468024de933202248e0a89bd22d5364f4fe (diff)
- 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@
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r--ssh-keysign.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 1f78c7a05..017af5307 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.22 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.23 2006/04/02 08:34:52 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -68,9 +68,9 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
68 buffer_init(&b); 68 buffer_init(&b);
69 buffer_append(&b, data, datalen); 69 buffer_append(&b, data, datalen);
70 70
71 /* session id, currently limited to SHA1 (20 bytes) */ 71 /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
72 p = buffer_get_string(&b, &len); 72 p = buffer_get_string(&b, &len);
73 if (len != 20) 73 if (len != 20 && len != 32)
74 fail++; 74 fail++;
75 xfree(p); 75 xfree(p);
76 76