From db42c6b8f37355a1bab86cc226ee9eca4ff6ec9b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 18 Jan 2010 10:01:43 +0100 Subject: [PATCH] Raise WARNS in secure/ as high as possible and fix some resulting warnings. --- crypto/openssh/clientloop.c | 4 ++-- crypto/openssh/readconf.c | 1 + crypto/openssh/servconf.c | 1 + crypto/openssh/session.c | 5 ++++- crypto/openssh/sshd.c | 3 ++- crypto/openssh/sshlogin.c | 1 + crypto/openssh/sshlogin.h | 2 +- secure/lib/libcipher/Makefile | 1 + secure/lib/libcipher/crypt.c | 12 +++--------- secure/lib/libssl/Makefile | 1 + secure/libexec/Makefile.inc | 1 + secure/usr.bin/bdes/Makefile | 1 + secure/usr.bin/openssl/Makefile | 1 + secure/usr.bin/scp/Makefile | 1 + secure/usr.bin/sftp/Makefile | 1 + secure/usr.bin/ssh-add/Makefile | 1 + secure/usr.bin/ssh-agent/Makefile | 1 + secure/usr.bin/ssh-keygen/Makefile | 1 + secure/usr.bin/ssh-keyscan/Makefile | 2 +- secure/usr.bin/ssh-vulnkey/Makefile | 2 +- secure/usr.bin/ssh/Makefile | 1 + secure/usr.sbin/Makefile.inc | 1 + secure/usr.sbin/sshd/auth-passwd-freebsd.c | 1 + 23 files changed, 30 insertions(+), 16 deletions(-) diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c index 8d28bdae2e..98949a5b03 100644 --- a/crypto/openssh/clientloop.c +++ b/crypto/openssh/clientloop.c @@ -1553,8 +1553,8 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) total_time = get_current_time() - start_time; 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); + verbose("Transferred: sent %ju, received %ju bytes, in %.1f seconds", + (uintmax_t)obytes, (uintmax_t)ibytes, total_time); if (total_time > 0) verbose("Bytes per second: sent %.1f, received %.1f", obytes / total_time, ibytes / total_time); diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index e26d952bec..7377ab9d68 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -43,6 +43,7 @@ #include "kex.h" #include "mac.h" #include "uidswap.h" +#include "version.h" /* Format of the configuration file: diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index c134053447..19253a8881 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -41,6 +41,7 @@ #include "match.h" #include "channels.h" #include "groupaccess.h" +#include "version.h" static void add_listen_addr(ServerOptions *, char *, int); static void add_one_listen_addr(ServerOptions *, char *, int); diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index b18a369a72..85b3eef105 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1137,7 +1137,10 @@ do_setup_env(Session *s, const char *shell) char *path = NULL; #else extern char **environ; - char **senv, **var; + char **senv; +#if 0 + char **var; +#endif #endif /* Initialize the environment. */ diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 52d07e29fd..2eedc9696d 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -1963,7 +1963,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 %ju, received %ju bytes", + (uintmax_t)obytes, (uintmax_t)ibytes); verbose("Closing connection to %.500s port %d", remote_ip, remote_port); diff --git a/crypto/openssh/sshlogin.c b/crypto/openssh/sshlogin.c index 33bd652fb0..0e95154666 100644 --- a/crypto/openssh/sshlogin.c +++ b/crypto/openssh/sshlogin.c @@ -59,6 +59,7 @@ #include "log.h" #include "buffer.h" #include "servconf.h" +#include "sshlogin.h" extern Buffer loginmsg; extern ServerOptions options; diff --git a/crypto/openssh/sshlogin.h b/crypto/openssh/sshlogin.h index 500d3fefd6..52119a979f 100644 --- a/crypto/openssh/sshlogin.h +++ b/crypto/openssh/sshlogin.h @@ -15,7 +15,7 @@ void record_login(pid_t, const char *, const char *, uid_t, const char *, struct sockaddr *, socklen_t); void record_logout(pid_t, const char *, const char *); -time_t get_last_login_time(uid_t, const char *, char *, u_int); +time_t get_last_login_time(uid_t, const char *, char *, size_t); #ifdef LOGIN_NEEDS_UTMPX void record_utmp_only(pid_t, const char *, const char *, const char *, diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile index 44e5b5cce0..44c30cc3cb 100644 --- a/secure/lib/libcipher/Makefile +++ b/secure/lib/libcipher/Makefile @@ -7,6 +7,7 @@ LIB= cipher SRCS= crypt.c PRECIOUSLIB= yes #NOPROFILE= yes +WARNS?= 2 MAN= cipher.3 MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3 diff --git a/secure/lib/libcipher/crypt.c b/secure/lib/libcipher/crypt.c index 13488cb499..abecf0b276 100644 --- a/secure/lib/libcipher/crypt.c +++ b/secure/lib/libcipher/crypt.c @@ -180,11 +180,6 @@ static u_long key_perm_maskl[8][128], key_perm_maskr[8][128]; static u_long comp_maskl[8][128], comp_maskr[8][128]; static u_long old_rawkey0, old_rawkey1; -static u_char ascii64[] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -/* 0000000000111111111122222222223333333333444444444455555555556666 */ -/* 0123456789012345678901234567890123456789012345678901234567890123 */ - static inline int ascii_to_bin(char ch) { @@ -361,7 +356,7 @@ int des_setkey(const char *key) { u_long k0, k1, rawkey0, rawkey1; - int shifts, i, b, round; + int shifts, round; if (!des_initialised) des_init(); @@ -408,7 +403,6 @@ des_setkey(const char *key) shifts = 0; for (round = 0; round < 16; round++) { u_long t0, t1; - int bit; shifts += key_shifts[round]; @@ -445,9 +439,9 @@ do_des( u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count) /* * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. */ - u_long mask, rawl, rawr, l, r, *kl, *kr, *kl1, *kr1; + u_long l, r, *kl, *kr, *kl1, *kr1; u_long f, r48l, r48r; - int i, j, b, round; + int round; if (count == 0) { return(1); diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 209237d349..8873c46d3e 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -3,6 +3,7 @@ LIB= ssl SHLIB_MAJOR= 4 +WARNS?= 2 NOLINT= true diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index f544144b5e..22a1017b1c 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -2,5 +2,6 @@ # $DragonFly: src/secure/libexec/Makefile.inc,v 1.2 2003/06/17 04:27:48 dillon Exp $ BINDIR?= /usr/libexec +WARNS?= 3 .include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile index c43f6bb2b8..742f400e62 100644 --- a/secure/usr.bin/bdes/Makefile +++ b/secure/usr.bin/bdes/Makefile @@ -4,6 +4,7 @@ PROG= bdes SRCS= bdes.c +WARNS?= 1 .if exists(${.OBJDIR}/../../lib/libcipher) LDFLAGS+= -L${.OBJDIR}/../../lib/libcipher diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index c91ddb6892..416e71265d 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -3,6 +3,7 @@ PROG= xopenssl PROGNAME= openssl +WARNS?= 3 DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index b24c25d27c..a4f3da35a6 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -3,6 +3,7 @@ PROG= scp SRCS= scp.c roaming_dummy.c +WARNS?= 3 .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index a5e84c9331..65c8d9dd51 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -3,6 +3,7 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c roaming_dummy.c +WARNS?= 2 # Portability layer SRCS+= fmt_scaled.c diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 3f1e585351..6e03ee5076 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -3,6 +3,7 @@ PROG= ssh-add SRCS+= ssh-add.c roaming_dummy.c +WARNS?= 3 .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 1e15e66152..edf34851c7 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -3,6 +3,7 @@ PROG= ssh-agent SRCS= ssh-agent.c roaming_dummy.c +WARNS?= 3 .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index f98d7b4fff..a30722b5d6 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -3,6 +3,7 @@ PROG= ssh-keygen SRCS= ssh-keygen.c roaming_dummy.c +WARNS?= 3 .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 045084710b..9db3de49f0 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -2,8 +2,8 @@ # $DragonFly: src/secure/usr.bin/ssh-keyscan/Makefile,v 1.4 2008/04/07 01:20:18 pavalos Exp $ PROG= ssh-keyscan - SRCS= ssh-keyscan.c misc.c roaming_dummy.c +WARNS?= 3 DPADD+= ${LIBZ} LDADD+= -lz diff --git a/secure/usr.bin/ssh-vulnkey/Makefile b/secure/usr.bin/ssh-vulnkey/Makefile index 2761b42081..9620feeff1 100644 --- a/secure/usr.bin/ssh-vulnkey/Makefile +++ b/secure/usr.bin/ssh-vulnkey/Makefile @@ -2,8 +2,8 @@ # $DragonFly: src/secure/usr.bin/ssh-vulnkey/Makefile,v 1.1 2008/05/16 11:44:56 corecode Exp $ PROG= ssh-vulnkey - SRCS= ssh-vulnkey.c roaming_dummy.c +WARNS?= 2 .include "../../Makefile.ssh.common" .include diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index f98deec8d9..4f2f03bdea 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -6,6 +6,7 @@ PROG= ssh LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 +WARNS?= 3 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c mux.c \ diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc index fdfa06f446..d531b05ec5 100644 --- a/secure/usr.sbin/Makefile.inc +++ b/secure/usr.sbin/Makefile.inc @@ -2,5 +2,6 @@ # $DragonFly: src/secure/usr.sbin/Makefile.inc,v 1.2 2003/06/17 04:27:48 dillon Exp $ BINDIR?= /usr/sbin +WARNS?= 2 .include "${.CURDIR}/../../Makefile.inc" diff --git a/secure/usr.sbin/sshd/auth-passwd-freebsd.c b/secure/usr.sbin/sshd/auth-passwd-freebsd.c index 0fcddc3736..eb966d6f3f 100644 --- a/secure/usr.sbin/sshd/auth-passwd-freebsd.c +++ b/secure/usr.sbin/sshd/auth-passwd-freebsd.c @@ -2,6 +2,7 @@ * $DragonFly: src/secure/usr.sbin/sshd/auth-passwd-freebsd.c,v 1.2 2006/09/28 18:42:50 corecode Exp $ */ +#include #include #include "buffer.h" -- 2.41.0