4 files changed, 16 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index db8af51fb..d2e7dceb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
      fd leak on error paths; from zinovik@
      NB. Id sync only; we use loginrec.c that was also audited and fixed
      recently
+   - djm@cvs.openbsd.org 2011/01/11 06:13:10
+     [clientloop.c ssh-keygen.c sshd.c]
+     some unsigned long long casts that make things a bit easier for
+     portable without resorting to dropping PRIu64 formats everywhere
 
 20110109
  - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by
diff --git a/clientloop.c b/clientloop.c
index 7712f69be..c60b758c7 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.228 2011/01/08 10:51:51 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.229 2011/01/11 06:13:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1622,7 +1622,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
         packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
         verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds",
-            obytes, ibytes, total_time);
+            (unsigned long long)obytes, (unsigned long long)ibytes, total_time);
         if (total_time > 0)
                 verbose("Bytes per second: sent %.1f, received %.1f",
                     obytes / total_time, ibytes / total_time);
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b9fd10abc..c95e4ab29 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.204 2010/10/28 11:22:09 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.205 2011/01/11 06:13:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1480,7 +1480,8 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
                 if (!quiet) {
                         logit("Signed %s key %s: id \"%s\" serial %llu%s%s "
                             "valid %s", key_cert_type(public), 
-                            out, public->cert->key_id, public->cert->serial,
+                            out, public->cert->key_id,
+                            (unsigned long long)public->cert->serial,
                             cert_principals != NULL ? " for " : "",
                             cert_principals != NULL ? cert_principals : "",
                             fmt_validity(cert_valid_from, cert_valid_to));
@@ -1705,8 +1706,10 @@ do_show_cert(struct passwd *pw)
         printf("        Signing CA: %s %s\n",
             key_type(key->cert->signature_key), ca_fp);
         printf("        Key ID: \"%s\"\n", key->cert->key_id);
-        if (!v00)
-                printf("        Serial: %llu\n", key->cert->serial);
+        if (!v00) {
+                printf("        Serial: %llu\n",
+                    (unsigned long long)key->cert->serial);
+        }
         printf("        Valid: %s\n",
             fmt_validity(key->cert->valid_after, key->cert->valid_before));
         printf("        Principals: ");
diff --git a/sshd.c b/sshd.c
index 5d4d14ae2..cb45cecbd 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.380 2010/09/22 05:01:29 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.381 2011/01/11 06:13:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2027,7 +2027,8 @@ main(int ac, char **av)
         /* The connection has been terminated. */
         packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
         packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
-        verbose("Transferred: sent %llu, received %llu bytes", obytes, ibytes);
+        verbose("Transferred: sent %llu, received %llu bytes",
+            (unsigned long long)obytes, (unsigned long long)ibytes);
 
         verbose("Closing connection to %.500s port %d", remote_ip, remote_port);