diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 11 | ||||
-rw-r--r-- | sshd.c | 5 |
4 files changed, 16 insertions, 8 deletions
@@ -12,6 +12,10 @@ | |||
12 | fd leak on error paths; from zinovik@ | 12 | fd leak on error paths; from zinovik@ |
13 | NB. Id sync only; we use loginrec.c that was also audited and fixed | 13 | NB. Id sync only; we use loginrec.c that was also audited and fixed |
14 | recently | 14 | recently |
15 | - djm@cvs.openbsd.org 2011/01/11 06:13:10 | ||
16 | [clientloop.c ssh-keygen.c sshd.c] | ||
17 | some unsigned long long casts that make things a bit easier for | ||
18 | portable without resorting to dropping PRIu64 formats everywhere | ||
15 | 19 | ||
16 | 20110109 | 20 | 20110109 |
17 | - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by | 21 | - (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 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.228 2011/01/08 10:51:51 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.229 2011/01/11 06:13:10 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
1622 | packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); | 1622 | packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); |
1623 | packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); | 1623 | packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); |
1624 | verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds", | 1624 | verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds", |
1625 | obytes, ibytes, total_time); | 1625 | (unsigned long long)obytes, (unsigned long long)ibytes, total_time); |
1626 | if (total_time > 0) | 1626 | if (total_time > 0) |
1627 | verbose("Bytes per second: sent %.1f, received %.1f", | 1627 | verbose("Bytes per second: sent %.1f, received %.1f", |
1628 | obytes / total_time, ibytes / total_time); | 1628 | 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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.204 2010/10/28 11:22:09 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.205 2011/01/11 06:13:10 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
1480 | if (!quiet) { | 1480 | if (!quiet) { |
1481 | logit("Signed %s key %s: id \"%s\" serial %llu%s%s " | 1481 | logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
1482 | "valid %s", key_cert_type(public), | 1482 | "valid %s", key_cert_type(public), |
1483 | out, public->cert->key_id, public->cert->serial, | 1483 | out, public->cert->key_id, |
1484 | (unsigned long long)public->cert->serial, | ||
1484 | cert_principals != NULL ? " for " : "", | 1485 | cert_principals != NULL ? " for " : "", |
1485 | cert_principals != NULL ? cert_principals : "", | 1486 | cert_principals != NULL ? cert_principals : "", |
1486 | fmt_validity(cert_valid_from, cert_valid_to)); | 1487 | fmt_validity(cert_valid_from, cert_valid_to)); |
@@ -1705,8 +1706,10 @@ do_show_cert(struct passwd *pw) | |||
1705 | printf(" Signing CA: %s %s\n", | 1706 | printf(" Signing CA: %s %s\n", |
1706 | key_type(key->cert->signature_key), ca_fp); | 1707 | key_type(key->cert->signature_key), ca_fp); |
1707 | printf(" Key ID: \"%s\"\n", key->cert->key_id); | 1708 | printf(" Key ID: \"%s\"\n", key->cert->key_id); |
1708 | if (!v00) | 1709 | if (!v00) { |
1709 | printf(" Serial: %llu\n", key->cert->serial); | 1710 | printf(" Serial: %llu\n", |
1711 | (unsigned long long)key->cert->serial); | ||
1712 | } | ||
1710 | printf(" Valid: %s\n", | 1713 | printf(" Valid: %s\n", |
1711 | fmt_validity(key->cert->valid_after, key->cert->valid_before)); | 1714 | fmt_validity(key->cert->valid_after, key->cert->valid_before)); |
1712 | printf(" Principals: "); | 1715 | printf(" Principals: "); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.380 2010/09/22 05:01:29 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.381 2011/01/11 06:13:10 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2027,7 +2027,8 @@ main(int ac, char **av) | |||
2027 | /* The connection has been terminated. */ | 2027 | /* The connection has been terminated. */ |
2028 | packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); | 2028 | packet_get_state(MODE_IN, NULL, NULL, NULL, &ibytes); |
2029 | packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); | 2029 | packet_get_state(MODE_OUT, NULL, NULL, NULL, &obytes); |
2030 | verbose("Transferred: sent %llu, received %llu bytes", obytes, ibytes); | 2030 | verbose("Transferred: sent %llu, received %llu bytes", |
2031 | (unsigned long long)obytes, (unsigned long long)ibytes); | ||
2031 | 2032 | ||
2032 | verbose("Closing connection to %.500s port %d", remote_ip, remote_port); | 2033 | verbose("Closing connection to %.500s port %d", remote_ip, remote_port); |
2033 | 2034 | ||