diff options
| author |   markus <markus@openbsd.org> | 2015-03-26 19:32:19 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2015-03-26 19:32:19 +0000 |
| commit | 2e887024810a8d7b437c03b15608cfb32e433be6 (patch) | |
| tree | fb1cc781b75d61523a7f32036984179d82db7b0a | |
| parent | pointers to slowcgi(8); from alexei malinin (diff) | |
| download | wireguard-openbsd-2e887024810a8d7b437c03b15608cfb32e433be6.tar.xz wireguard-openbsd-2e887024810a8d7b437c03b15608cfb32e433be6.zip | |
sigp and lenp are not optional in ssh_agent_sign(); ok djm@
| -rw-r--r-- | usr.bin/ssh/authfd.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index 898deaef3de..fab5e6d0278 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/authfd.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -436,10 +436,8 @@ ssh_agent_sign(int sock, struct sshkey *key, u_int flags = 0; int r = SSH_ERR_INTERNAL_ERROR; - if (sigp != NULL) - *sigp = NULL; - if (lenp != NULL) - *lenp = 0; + *sigp = NULL; + *lenp = 0; if (datalen > SSH_KEY_MAX_SIGN_DATA_SIZE) return SSH_ERR_INVALID_ARGUMENT; @@ -467,8 +465,7 @@ ssh_agent_sign(int sock, struct sshkey *key, } if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) goto out; - if (lenp != NULL) - *lenp = len; + *lenp = len; r = 0; out: if (blob != NULL) { |