- djm@cvs.openbsd.org 2010/04/16 01:47:26

     [PROTOCOL.certkeys auth-options.c auth-options.h auth-rsa.c]
     [auth2-pubkey.c authfd.c key.c key.h myproposal.h ssh-add.c]
     [ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-rsa.c]
     [sshconnect.c sshconnect2.c sshd.c]
     revised certificate format ssh-{dss,rsa}-cert-v01@openssh.com with the
     following changes:

     move the nonce field to the beginning of the certificate where it can
     better protect against chosen-prefix attacks on the signature hash

     Rename "constraints" field to "critical options"

     Add a new non-critical "extensions" field

     Add a serial number

     The older format is still support for authentication and cert generation
     (use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate)

     ok markus@

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;
         }