remove experimental, never-enabled JPAKE code; ok markus@

1 files changed, 26 insertions, 7 deletions

diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 4f09fef62c9..a1b059ebadf 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,20 +1,39 @@
-#	$OpenBSD: Makefile.inc,v 1.41 2014/01/18 05:54:51 martynas Exp $
+#	$OpenBSD: Makefile.inc,v 1.42 2014/01/29 06:18:35 djm Exp $
 
 CFLAGS+=	-I${.CURDIR}/..
 
 CDIAGFLAGS=	-Wall
-#CDIAGFLAGS+=	-Werror
+CDIAGFLAGS+=	-Wchar-subscripts
+CDIAGFLAGS+=	-Wcomment
+CDIAGFLAGS+=	-Wextra
+CDIAGFLAGS+=	-Wformat
+CDIAGFLAGS+=	-Wformat-security
+CDIAGFLAGS+=	-Wimplicit
+CDIAGFLAGS+=	-Winline
+CDIAGFLAGS+=	-Wmissing-declarations
+CDIAGFLAGS+=	-Wmissing-prototypes
+CDIAGFLAGS+=	-Wparentheses
 CDIAGFLAGS+=	-Wpointer-arith
-CDIAGFLAGS+=	-Wuninitialized
+CDIAGFLAGS+=	-Wreturn-type
+CDIAGFLAGS+=	-Wshadow
+CDIAGFLAGS+=	-Wsign-compare
+CDIAGFLAGS+=	-Wstrict-aliasing
 CDIAGFLAGS+=	-Wstrict-prototypes
-CDIAGFLAGS+=	-Wmissing-prototypes
+CDIAGFLAGS+=	-Wswitch
+CDIAGFLAGS+=	-Wtrigraphs
+CDIAGFLAGS+=	-Wuninitialized
 CDIAGFLAGS+=	-Wunused
-CDIAGFLAGS+=	-Wsign-compare
-CDIAGFLAGS+=	-Wshadow
+CDIAGFLAGS+=	-Wold-style-definition
+CDIAGFLAGS+=	-Wno-unused-parameter # Not clean for this yet
+#CDIAGFLAGS+=	-Wwrite-strings # XXX too messy; needs libc changes
+#CDIAGFLAGS+=	-Wcast-qual # XXX not clean
+#CDIAGFLAGS+=	-Wcast-align # XXX can't be clean with sockaddr casts?
 
+#CDIAGFLAGS+=	-Werror
 #DEBUG=-g
 
-#CFLAGS+=	-DJPAKE
+WARNINGS=yes
+INSTALL_STRIP=
 
 CFLAGS+=	-DENABLE_PKCS11
 .include <bsd.own.mk>