diff options
| author | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
| commit | c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch) | |
| tree | 286162d33ef4c84bb329fd42641bbe0dd68cc42c /crypto/openssh/ssh-dss.c | |
| parent | 68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff) | |
| parent | 57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff) | |
| download | FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz | |
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/ssh-dss.c')
| -rw-r--r-- | crypto/openssh/ssh-dss.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-dss.c b/crypto/openssh/ssh-dss.c index 51a06e9..449f493 100644 --- a/crypto/openssh/ssh-dss.c +++ b/crypto/openssh/ssh-dss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-dss.c,v 1.24 2006/11/06 21:25:28 markus Exp $ */ +/* $OpenBSD: ssh-dss.c,v 1.25 2010/02/26 20:29:54 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -53,7 +53,9 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp, u_int rlen, slen, len, dlen; Buffer b; - if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) { + if (key == NULL || + (key->type != KEY_DSA && key->type != KEY_DSA_CERT) || + key->dsa == NULL) { error("ssh_dss_sign: no DSA key"); return -1; } @@ -116,7 +118,9 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen, int rlen, ret; Buffer b; - if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) { + if (key == NULL || + (key->type != KEY_DSA && key->type != KEY_DSA_CERT) || + key->dsa == NULL) { error("ssh_dss_verify: no DSA key"); return -1; } |
