1 files changed, 16 insertions, 6 deletions

diff --git a/ssh-keysign.c b/ssh-keysign.c
index dae3a2e8c..c4bc7e56e 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ssh-keysign.c,v 1.29 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -21,21 +22,30 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keysign.c,v 1.19 2005/09/13 23:40:07 djm Exp $");
+
+#include <fcntl.h>
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 
+#include "xmalloc.h"
 #include "log.h"
 #include "key.h"
 #include "ssh.h"
 #include "ssh2.h"
 #include "misc.h"
-#include "xmalloc.h"
 #include "buffer.h"
-#include "bufaux.h"
 #include "authfile.h"
 #include "msg.h"
 #include "canohost.h"
@@ -64,9 +74,9 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
         buffer_init(&b);
         buffer_append(&b, data, datalen);
 
-        /* session id, currently limited to SHA1 (20 bytes) */
+        /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
         p = buffer_get_string(&b, &len);
-        if (len != 20)
+        if (len != 20 && len != 32)
                 fail++;
         xfree(p);
 
@@ -140,7 +150,7 @@ main(int argc, char **argv)
 {
         Buffer b;
         Options options;
-        Key *keys[2], *key;
+        Key *keys[2], *key = NULL;
         struct passwd *pw;
         int key_fd[2], i, found, version = 2, fd;
         u_char *signature, *data;