tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
sigp and lenp are not optional in ssh_agent_sign(); ok
 djm@
This commit is contained in:
markus@openbsd.org 2015-03-26 19:32:19 +00:00 committed by Damien Miller
parent 1b0ef38132
commit fecede00a7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
authfd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfd.c,v 1.96 2015/03/25 19:21:48 markus Exp $ */ /* $OpenBSD: authfd.c,v 1.97 2015/03/26 19:32:19 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -438,10 +438,8 @@ ssh_agent_sign(int sock, struct sshkey *key,
u_int flags = 0; u_int flags = 0;
int r = SSH_ERR_INTERNAL_ERROR; int r = SSH_ERR_INTERNAL_ERROR;
if (sigp != NULL) *sigp = NULL;
*sigp = NULL; *lenp = 0;
if (lenp != NULL)
*lenp = 0;
if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE) if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE)
return SSH_ERR_INVALID_ARGUMENT; return SSH_ERR_INVALID_ARGUMENT;
@ -469,8 +467,7 @@ ssh_agent_sign(int sock, struct sshkey *key,
} }
if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) if ((r = sshbuf_get_string(msg, sigp, &len)) != 0)
goto out; goto out;
if (lenp != NULL) *lenp = len;
*lenp = len;
r = 0; r = 0;
out: out:
if (blob != NULL) { if (blob != NULL) {