diff options
| author |   deraadt <deraadt@openbsd.org> | 2001-02-04 23:56:22 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2001-02-04 23:56:22 +0000 |
| commit | 8f491fea6bdcdf1b6e7c7900c7a04d6e9d6c08c6 (patch) | |
| tree | 3dca7881af145ae62fa0b2efe2b9b28a9f82be9c | |
| parent | sort commands, so that abbreviations work as expected (diff) | |
| download | wireguard-openbsd-8f491fea6bdcdf1b6e7c7900c7a04d6e9d6c08c6.tar.xz wireguard-openbsd-8f491fea6bdcdf1b6e7c7900c7a04d6e9d6c08c6.zip | |
alpha happiness
| -rw-r--r-- | usr.bin/ssh/scp.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index 7a7fbb2a83c..cfb355745a4 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.52 2001/02/04 15:32:24 stevesk Exp $"); +RCSID("$OpenBSD: scp.c,v 1.53 2001/02/04 23:56:22 deraadt Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -1132,7 +1132,8 @@ progressmeter(int flag) abbrevsize >>= 10; } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5qd %c%c ", - (quad_t) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B'); + (unsigned long long) abbrevsize, prefixes[i], + prefixes[i] == ' ' ? ' ' : 'B'); timersub(&now, &lastupdate, &wait); if (cursize > lastsize) { diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index f9efc81419b..bae91bf9888 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.162 2001/02/04 22:12:17 stevesk Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1323,8 +1323,8 @@ do_ssh1_kex(void) len = BN_num_bytes(session_key_int); if (len < 0 || len > sizeof(session_key)) { error("do_connection: bad session key len from %s: " - "session_key_int %d > sizeof(session_key) %ld", - get_remote_ipaddr(), len, sizeof(session_key)); + "session_key_int %d > sizeof(session_key) %d", + get_remote_ipaddr(), len, (int)sizeof(session_key)); rsafail++; } else { memset(session_key, 0, sizeof(session_key)); |