aboutsummaryrefslogtreecommitdiff
path: root/ssh-dss.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2017-01-31 12:29:48 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2017-01-31 12:29:48 +0000
commitab4ec008e7abd1c8098428dbf9642c3685383045 (patch)
treefeb16b3395021bd0f5667967c25f2bb77f8b691e /ssh-dss.c
parent8f8c559269bccf737d318b89630a0ef812865b99 (diff)
downloadsrc-ab4ec008e7abd1c8098428dbf9642c3685383045.tar.gz
src-ab4ec008e7abd1c8098428dbf9642c3685383045.zip
Vendor import of OpenSSH 7.3p1.vendor/openssh/7.3p1
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=313010 svn path=/vendor-crypto/openssh/7.3p1/; revision=313011; tag=vendor/openssh/7.3p1
Diffstat (limited to 'ssh-dss.c')
-rw-r--r--ssh-dss.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-dss.c b/ssh-dss.c
index cc47dcf5f14f..7af59fa6e19c 100644
--- a/ssh-dss.c
+++ b/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;