diff options
author | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
commit | a8ed8d256b2e2c05b0c15565a7938028c5192277 (patch) | |
tree | 87abbdc914a38b43e4e5bb9581ad1f46eabbf88e /ssh-dss.c | |
parent | f0329aac23c61e1a5197d6d57349a63f459bccb0 (diff) | |
parent | 99522ba7ec6963a05c04a156bf20e3ba3605987c (diff) |
Import openssh_7.3p1.orig.tar.gz
Diffstat (limited to 'ssh-dss.c')
-rw-r--r-- | ssh-dss.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-dss.c,v 1.34 2015/12/11 04:21:12 mmcc Exp $ */ | 1 | /* $OpenBSD: ssh-dss.c,v 1.35 2016/04/21 06:08:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -139,7 +139,8 @@ ssh_dss_verify(const struct sshkey *key, | |||
139 | char *ktype = NULL; | 139 | char *ktype = NULL; |
140 | 140 | ||
141 | if (key == NULL || key->dsa == NULL || | 141 | if (key == NULL || key->dsa == NULL || |
142 | sshkey_type_plain(key->type) != KEY_DSA) | 142 | sshkey_type_plain(key->type) != KEY_DSA || |
143 | signature == NULL || signaturelen == 0) | ||
143 | return SSH_ERR_INVALID_ARGUMENT; | 144 | return SSH_ERR_INVALID_ARGUMENT; |
144 | if (dlen == 0) | 145 | if (dlen == 0) |
145 | return SSH_ERR_INTERNAL_ERROR; | 146 | return SSH_ERR_INTERNAL_ERROR; |