upstream commit

fix signed/unsigned errors reported by clang-3.7; add
 sshbuf_dup_string() to replace a common idiom of strdup(sshbuf_ptr()) with
 better safety checking; feedback and ok markus@

Upstream-ID: 71f926d9bb3f1efed51319a6daf37e93d57c8820

1 files changed, 4 insertions, 4 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 478520123..079f10321 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.288 2016/02/15 09:47:49 dtucker Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.289 2016/05/02 08:49:03 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -883,7 +883,7 @@ do_fingerprint(struct passwd *pw)
         char *comment = NULL, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES];
         int i, invalid = 1;
         const char *path;
-        long int lnum = 0;
+        u_long lnum = 0;
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
@@ -946,7 +946,7 @@ do_fingerprint(struct passwd *pw)
                 }
                 /* Retry after parsing leading hostname/key options */
                 if (public == NULL && (public = try_read_key(&cp)) == NULL) {
-                        debug("%s:%ld: not a public key", path, lnum);
+                        debug("%s:%lu: not a public key", path, lnum);
                         continue;
                 }
 
@@ -1920,7 +1920,7 @@ do_show_cert(struct passwd *pw)
         FILE *f;
         char *cp, line[SSH_MAX_PUBKEY_BYTES];
         const char *path;
-        long int lnum = 0;
+        u_long lnum = 0;
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");