- 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, 12 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index bc0d2753f..a7d3ee5c4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.374 2010/03/07 11:57:13 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.375 2010/04/16 01:47:26 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -744,6 +744,8 @@ list_hostkey_types(void)
                 if (key == NULL)
                         continue;
                 switch (key->type) {
+                case KEY_RSA_CERT_V00:
+                case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
                         if (buffer_len(&b) > 0)
@@ -767,10 +769,17 @@ get_hostkey_by_type(int type, int need_private)
         Key *key;
 
         for (i = 0; i < options.num_host_key_files; i++) {
-                if (type == KEY_RSA_CERT || type == KEY_DSA_CERT)
+                switch (type) {
+                case KEY_RSA_CERT_V00:
+                case KEY_DSA_CERT_V00:
+                case KEY_RSA_CERT:
+                case KEY_DSA_CERT:
                         key = sensitive_data.host_certificates[i];
-                else
+                        break;
+                default:
                         key = sensitive_data.host_keys[i];
+                        break;
+                }
                 if (key != NULL && key->type == type)
                         return need_private ?
                             sensitive_data.host_keys[i] : key;