commit b6e0140a5aa883c27b98415bd8aa9f65fc04ee22
author djm@openbsd.org <djm@openbsd.org> Thu Apr 21 06:08:02 2016 +0000
committer Damien Miller <djm@mindrot.org> Thu Apr 21 16:30:11 2016 +1000
tree 1a7e85eafbe333ad5fc5a385f03161b51b00d4c9
parent 6aaabc2b610e44bae473457ad9556ffb43d90ee3

upstream commit

make argument == NULL tests more consistent

Upstream-ID: dc4816678704aa5cbda3a702e0fa2033ff04581d

ssh-dss.c

diff --git a/ssh-dss.c b/ssh-dss.c
index cc47dcf..7af59fa 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 @@
 	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;