diff options
| author | des <des@FreeBSD.org> | 2017-09-01 21:24:32 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2017-09-01 21:24:32 +0000 |
| commit | b0f58e84d3bf7e6d2b3de84d05a19f3e6d6318da (patch) | |
| tree | 8959bafd55636a0889cf8324e8823fc03ac0cb44 /crypto/openssh/ssh-dss.c | |
| parent | 0eded4b25dbd3ea70640a2ed72755c4ff95b31c9 (diff) | |
| download | FreeBSD-src-b0f58e84d3bf7e6d2b3de84d05a19f3e6d6318da.zip FreeBSD-src-b0f58e84d3bf7e6d2b3de84d05a19f3e6d6318da.tar.gz | |
Upgrade OpenSSH to 7.3p1.
This is the last version of OpenSSH which does not break compatibility
more than we can live with in a stable branch. Further commits will
follow to backport some bug fixes from newer versions.
Approved by: re@
Diffstat (limited to 'crypto/openssh/ssh-dss.c')
| -rw-r--r-- | crypto/openssh/ssh-dss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/ssh-dss.c b/crypto/openssh/ssh-dss.c index cc47dcf..7af59fa 100644 --- a/crypto/openssh/ssh-dss.c +++ b/crypto/openssh/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. * @@ -139,7 +139,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; |
