>Number:         12618
>Category:       bin
>Synopsis:       cvs doesn't support encryption
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 11 17:39:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Love
>Release:        NetBSD-1.5U
>Organization:
	Stacken Computer Club
>Environment:
	
System: NetBSD nutcracker.dynarc.se 1.5U NetBSD 1.5U (NUTCRACKER) #3: Mon Apr 9 16:12:48 CEST 2001 lha@nutcracker.dynarc.se:/usr/src/sys/arch/i386/compile/NUTCRACKER i386
Architecture: i386
Machine: i386

>Description:

	cvs doesn't support encryption

	I really don't want to enable encryption for all my cvsroots
	(with .cvsrc) , but I want to use it for some, and then it
	should be possible to enable it.

>How-To-Repeat:

	: lha@nutcracker ; cvs -x -d :kserver:host:/cvsroot co module
	cvs [checkout aborted]: This client does not support encryption

>Fix:

Index: gnu/dist/cvs/src/server.c
===================================================================
RCS file: /cvsroot/gnusrc/gnu/dist/cvs/src/server.c,v
retrieving revision 1.5
diff -u -w -r1.5 server.c
--- server.c	2001/03/04 06:29:30	1.5
+++ server.c	2001/04/12 00:31:31
@@ -6151,7 +6151,7 @@
     struct krb_encrypt_data *kd = (struct krb_encrypt_data *) fnclosure;
     int tcount;
 
-    des_cbc_encrypt ((C_Block *) input, (C_Block *) output,
+    des_cbc_encrypt ((char *) input, (char *) output,
 		     size, kd->sched, &kd->block, 0);
 
     /* SIZE is the size of the buffer, which is set by the encryption
@@ -6198,7 +6198,7 @@
        fail over a long network connection.  We trust krb_recvauth to
        guard against a replay attack.  */
 
-    des_cbc_encrypt ((C_Block *) input, (C_Block *) output, aligned,
+    des_cbc_encrypt ((char *) input, (char *) output, aligned,
 		     kd->sched, &kd->block, 1);
 
     *translated = aligned;
Index: gnu/usr.bin/cvs/cvs/Makefile
===================================================================
RCS file: /cvsroot/gnusrc/gnu/usr.bin/cvs/cvs/Makefile,v
retrieving revision 1.4
diff -u -w -r1.4 Makefile
--- Makefile	2001/03/28 09:18:38	1.4
+++ Makefile	2001/04/12 00:31:31
@@ -22,6 +22,7 @@
 LDADD+= ${LIBDIFF} ${LIBCVS} -lcrypt -lz
 
 .if (${MKKERBEROS} != "no")
+CPPFLAGS+= -DENCRYPTION
 CPPFLAGS+= -DHAVE_KERBEROS -I${DESTDIR}/usr/include/kerberosIV
 DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
 LDADD+= -lkrb -ldes -lcom_err -lroken -lcrypt
>Release-Note:
>Audit-Trail:
>Unformatted: