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-rsa.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-rsa.c')
| -rw-r--r-- | usr.bin/ssh/ssh-rsa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-rsa.c b/usr.bin/ssh/ssh-rsa.c index 59329bda842..8c64235e465 100644 --- a/usr.bin/ssh/ssh-rsa.c +++ b/usr.bin/ssh/ssh-rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-rsa.c,v 1.58 2015/12/11 04:21:12 mmcc Exp $ */ +/* $OpenBSD: ssh-rsa.c,v 1.59 2016/04/21 06:08:02 djm Exp $ */ /* * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> * @@ -167,7 +167,8 @@ ssh_rsa_verify(const struct sshkey *key, if (key == NULL || key->rsa == NULL || sshkey_type_plain(key->type) != KEY_RSA || - BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) + BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE || + sig == NULL || siglen == 0) return SSH_ERR_INVALID_ARGUMENT; if ((b = sshbuf_from(sig, siglen)) == NULL) |