diff options
| author |   djm <djm@openbsd.org> | 2016-04-21 06:08:02 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-04-21 06:08:02 +0000 |
| commit | 2fb1ed3ca9476e9f879a5aad1d23bd96e3f82512 (patch) | |
| tree | 90de4635261647a8febeca24bf4bb726f67a853c /usr.bin/ssh/ssh-dss.c | |
| parent | Remove some incorrect and outdated references to pool debugging from pool.h (diff) | |
| download | wireguard-openbsd-2fb1ed3ca9476e9f879a5aad1d23bd96e3f82512.tar.xz wireguard-openbsd-2fb1ed3ca9476e9f879a5aad1d23bd96e3f82512.zip | |
make argument == NULL tests more consistent
Diffstat (limited to 'usr.bin/ssh/ssh-dss.c')
| -rw-r--r-- | usr.bin/ssh/ssh-dss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-dss.c b/usr.bin/ssh/ssh-dss.c index 00b2eb19ea5..b45e698481d 100644 --- a/usr.bin/ssh/ssh-dss.c +++ b/usr.bin/ssh/ssh-dss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-dss.c,v 1.34 2015/12/11 04:21:12 mmcc Exp $ */ +/* $OpenBSD: ssh-dss.c,v 1.35 2016/04/21 06:08:02 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -133,7 +133,8 @@ ssh_dss_verify(const struct sshkey *key, char *ktype = NULL; if (key == NULL || key->dsa == NULL || - sshkey_type_plain(key->type) != KEY_DSA) + sshkey_type_plain(key->type) != KEY_DSA || + signature == NULL || signaturelen == 0) return SSH_ERR_INVALID_ARGUMENT; if (dlen == 0) return SSH_ERR_INTERNAL_ERROR; |