* New upstream release (http://www.openssh.com/txt/release-5.6):

  - Added a ControlPersist option to ssh_config(5) that automatically
    starts a background ssh(1) multiplex master when connecting.  This
    connection can stay alive indefinitely, or can be set to automatically
    close after a user-specified duration of inactivity (closes: #335697,
    #350898, #454787, #500573, #550262).
  - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
    HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
    Match blocks (closes: #549858).
  - sftp(1): fix ls in working directories that contain globbing
    characters in their pathnames (LP: #530714).

1 files changed, 5 insertions, 7 deletions

diff --git a/ssh-dss.c b/ssh-dss.c
index 449f493b4..175e4d030 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-dss.c,v 1.25 2010/02/26 20:29:54 djm Exp $ */
+/* $OpenBSD: ssh-dss.c,v 1.26 2010/04/16 01:47:26 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -53,9 +53,8 @@ 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->type != KEY_DSA_CERT) ||
-            key->dsa == NULL) {
+        if (key == NULL || key->dsa == NULL || (key->type != KEY_DSA &&
+            key->type != KEY_DSA_CERT && key->type != KEY_DSA_CERT_V00)) {
                 error("ssh_dss_sign: no DSA key");
                 return -1;
         }
@@ -118,9 +117,8 @@ 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->type != KEY_DSA_CERT) ||
-            key->dsa == NULL) {
+        if (key == NULL || key->dsa == NULL || (key->type != KEY_DSA &&
+            key->type != KEY_DSA_CERT && key->type != KEY_DSA_CERT_V00)) {
                 error("ssh_dss_verify: no DSA key");
                 return -1;
         }