diff options
-rw-r--r-- | authfd.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.96 2015/03/25 19:21:48 markus Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.97 2015/03/26 19:32:19 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -438,10 +438,8 @@ ssh_agent_sign(int sock, struct sshkey *key, | |||
438 | u_int flags = 0; | 438 | u_int flags = 0; |
439 | int r = SSH_ERR_INTERNAL_ERROR; | 439 | int r = SSH_ERR_INTERNAL_ERROR; |
440 | 440 | ||
441 | if (sigp != NULL) | 441 | *sigp = NULL; |
442 | *sigp = NULL; | 442 | *lenp = 0; |
443 | if (lenp != NULL) | ||
444 | *lenp = 0; | ||
445 | 443 | ||
446 | if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE) | 444 | if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE) |
447 | return SSH_ERR_INVALID_ARGUMENT; | 445 | return SSH_ERR_INVALID_ARGUMENT; |
@@ -469,8 +467,7 @@ ssh_agent_sign(int sock, struct sshkey *key, | |||
469 | } | 467 | } |
470 | if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) | 468 | if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) |
471 | goto out; | 469 | goto out; |
472 | if (lenp != NULL) | 470 | *lenp = len; |
473 | *lenp = len; | ||
474 | r = 0; | 471 | r = 0; |
475 | out: | 472 | out: |
476 | if (blob != NULL) { | 473 | if (blob != NULL) { |