RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

better error value for invalid signature length
This commit is contained in:
djm@openbsd.org 2014-12-10 01:24:09 +00:00 committed by Damien Miller
parent 4bfad14ca5
commit 4cf87f4b81
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sshkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.5 2014/11/18 01:02:25 djm Exp $ */ /* $OpenBSD: sshkey.c,v 1.6 2014/12/10 01:24:09 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@ -2124,10 +2124,7 @@ sshkey_verify(const struct sshkey *key,
const u_char *sig, size_t siglen, const u_char *sig, size_t siglen,
const u_char *data, size_t dlen, u_int compat) const u_char *data, size_t dlen, u_int compat)
{ {
if (siglen == 0) if (siglen == 0 || dlen > SSH_KEY_MAX_SIGN_DATA_SIZE)
return -1;
if (dlen > SSH_KEY_MAX_SIGN_DATA_SIZE)
return SSH_ERR_INVALID_ARGUMENT; return SSH_ERR_INVALID_ARGUMENT;
switch (key->type) { switch (key->type) {
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL