tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2011-01-11 17:20:29 +11:00
parent a256c8d680
commit 821de0ad2e
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -12,6 +12,10 @@
fd leak on error paths; from zinovik@ fd leak on error paths; from zinovik@
NB. Id sync only; we use loginrec.c that was also audited and fixed NB. Id sync only; we use loginrec.c that was also audited and fixed
recently 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 20110109
- (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by

4
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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_IN, NULL, NULL, NULL, &ibytes);
packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes);
verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds", 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) if (total_time > 0)
verbose("Bytes per second: sent %.1f, received %.1f", verbose("Bytes per second: sent %.1f, received %.1f",
obytes / total_time, ibytes / total_time); obytes / total_time, ibytes / total_time);

11
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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) { if (!quiet) {
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " logit("Signed %s key %s: id \"%s\" serial %llu%s%s "
"valid %s", key_cert_type(public), "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 ? " for " : "",
cert_principals != NULL ? cert_principals : "", cert_principals != NULL ? cert_principals : "",
fmt_validity(cert_valid_from, cert_valid_to)); fmt_validity(cert_valid_from, cert_valid_to));
@ -1705,8 +1706,10 @@ do_show_cert(struct passwd *pw)
printf(" Signing CA: %s %s\n", printf(" Signing CA: %s %s\n",
key_type(key->cert->signature_key), ca_fp); key_type(key->cert->signature_key), ca_fp);
printf(" Key ID: \"%s\"\n", key->cert->key_id); printf(" Key ID: \"%s\"\n", key->cert->key_id);
if (!v00) if (!v00) {
printf(" Serial: %llu\n", key->cert->serial); printf(" Serial: %llu\n",
(unsigned long long)key->cert->serial);
}
printf(" Valid: %s\n", printf(" Valid: %s\n",
fmt_validity(key->cert->valid_after, key->cert->valid_before)); fmt_validity(key->cert->valid_after, key->cert->valid_before));
printf(" Principals: "); printf(" Principals: ");

5
sshd.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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. */ /* The connection has been terminated. */
packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes);
packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); 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); verbose("Closing connection to %.500s port %d", remote_ip, remote_port);