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-ed25519.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-ed25519.c')
| -rw-r--r-- | usr.bin/ssh/ssh-ed25519.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-ed25519.c b/usr.bin/ssh/ssh-ed25519.c index fdb448c03a3..e309d876b3b 100644 --- a/usr.bin/ssh/ssh-ed25519.c +++ b/usr.bin/ssh/ssh-ed25519.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-ed25519.c,v 1.6 2015/01/15 21:38:50 markus Exp $ */ +/* $OpenBSD: ssh-ed25519.c,v 1.7 2016/04/21 06:08:02 djm Exp $ */ /* * Copyright (c) 2013 Markus Friedl <markus@openbsd.org> * @@ -104,7 +104,8 @@ ssh_ed25519_verify(const struct sshkey *key, if (key == NULL || sshkey_type_plain(key->type) != KEY_ED25519 || key->ed25519_pk == NULL || - datalen >= INT_MAX - crypto_sign_ed25519_BYTES) + datalen >= INT_MAX - crypto_sign_ed25519_BYTES || + signature == NULL || signaturelen == 0) return SSH_ERR_INVALID_ARGUMENT; if ((b = sshbuf_from(signature, signaturelen)) == NULL) |