Index: lib/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/lib/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- lib/Makefile	21 Nov 2003 11:57:03 -0000	1.46
+++ lib/Makefile	24 Feb 2004 09:56:51 -0000
@@ -21,11 +21,11 @@
 
 .include <bsd.own.mk>
 
-.if (${KERBEROS5:L} == "yes")
-CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
-
-SRCS+= gss-genr.c
-CFLAGS+= -DGSSAPI
-.endif # KERBEROS5
+#.if (${KERBEROS5:L} == "yes")
+#CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
+#
+#SRCS+= gss-genr.c
+#CFLAGS+= -DGSSAPI
+#.endif # KERBEROS5
 
 .include <bsd.lib.mk>
Index: ssh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- ssh/Makefile	21 Nov 2003 11:57:03 -0000	1.51
+++ ssh/Makefile	24 Feb 2004 09:57:09 -0000
@@ -17,16 +17,16 @@
 
 .include <bsd.own.mk> # for AFS
 
-.if (${KERBEROS5:L} == "yes")
-CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
-.endif # KERBEROS5
+#.if (${KERBEROS5:L} == "yes")
+#CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
+#.endif # KERBEROS5
 
 .include <bsd.prog.mk>
 
-.if (${KERBEROS5:L} == "yes")
-DPADD+=  ${LIBGSSAPI} ${LIBKRB5}
-LDADD+=  -lgssapi -lkrb5
-.endif # KERBEROS5
+#.if (${KERBEROS5:L} == "yes")
+#DPADD+=  ${LIBGSSAPI} ${LIBKRB5}
+#LDADD+=  -lgssapi -lkrb5
+#.endif # KERBEROS5
 
 DPADD+=	${LIBCRYPTO} ${LIBZ} ${LIBDES}
 LDADD+=	-lcrypto -lz -ldes
Index: sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- sshd/Makefile	23 Dec 2003 16:12:10 -0000	1.62
+++ sshd/Makefile	24 Feb 2004 09:57:18 -0000
@@ -20,17 +20,17 @@
 
 .include <bsd.own.mk> # for KERBEROS and AFS
 
-.if (${KERBEROS5:L} == "yes")
-CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
-SRCS+=  auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c
-.endif
+#.if (${KERBEROS5:L} == "yes")
+#CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
+#SRCS+=  auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c
+#.endif
 
 .include <bsd.prog.mk>
 
-.if (${KERBEROS5:L} == "yes")
-LDADD+= -lgssapi -lkrb5 -lkafs
-DPADD+= ${LIBGSSAPI} ${LIBKRB5}
-.endif
+#.if (${KERBEROS5:L} == "yes")
+#LDADD+= -lgssapi -lkrb5 -lkafs
+#DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+#.endif
 
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES}
 LDADD+=	-lcrypto -lutil -lz -ldes
Index: cipher.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/cipher.c,v
retrieving revision 1.68
diff -u -r1.68 cipher.c
--- cipher.c	23 Jan 2004 19:26:33 -0000	1.68
+++ cipher.c	24 Feb 2004 09:56:12 -0000
@@ -52,6 +52,7 @@
 extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);
 extern const EVP_CIPHER *evp_aes_128_ctr(void);
 extern void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
+#define EVP_acss NULL
 
 struct Cipher {
 	char	*name;