upstream commit

make argument == NULL tests more consistent

Upstream-ID: dc4816678704aa5cbda3a702e0fa2033ff04581d

1 files changed, 3 insertions, 2 deletions

diff --git a/ssh-dss.c b/ssh-dss.c
index cc47dcf5f..7af59fa6e 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;