tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix ssh-keysign for KEX algorithms that use SHA384/512 

exchange hashes; feedback/ok markus@

OpenBSD-Commit-ID: 09a8fda1c081f5de1e3128df64f28b7bdadee239
This commit is contained in:
djm@openbsd.org 2021-11-10 06:25:08 +00:00 committed by Damien Miller
parent 6997a592ec
commit 239da797cb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh-keysign.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keysign.c,v 1.67 2021/07/05 01:16:46 dtucker Exp $ */
/* $OpenBSD: ssh-keysign.c,v 1.68 2021/11/10 06:25:08 djm Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@ -80,10 +80,13 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret,
if ((b = sshbuf_from(data, datalen)) == NULL)
fatal_f("sshbuf_from failed");
/* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
/* session id */
if ((r = sshbuf_get_string(b, NULL, &len)) != 0)
fatal_fr(r, "parse session ID");
if (len != 20 && len != 32)
if (len != 20 && /* SHA1 */
len != 32 && /* SHA256 */
len != 48 && /* SHA384 */
len != 64) /* SHA512 */
fail++;
if ((r = sshbuf_get_u8(b, &type)) != 0)