[src/trunk]: src/gnu enable encryption support in client-server CVS.

[assar <assar%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d8e1814de5b
branches:  trunk
changeset: 509898:9d8e1814de5b
user:      assar <assar%NetBSD.org@localhost>
date:      Tue May 15 09:56:30 2001 +0000

description:
enable encryption support in client-server CVS.
patch from PR bin/12618, by lha%stacken.kth.se@localhost

diffstat:

 gnu/dist/cvs/src/server.c    |  4 ++--
 gnu/usr.bin/cvs/cvs/Makefile |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 311540aa964b -r 9d8e1814de5b gnu/dist/cvs/src/server.c
--- a/gnu/dist/cvs/src/server.c Tue May 15 09:10:05 2001 +0000
+++ b/gnu/dist/cvs/src/server.c Tue May 15 09:56:30 2001 +0000
@@ -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;
diff -r 311540aa964b -r 9d8e1814de5b gnu/usr.bin/cvs/cvs/Makefile
--- a/gnu/usr.bin/cvs/cvs/Makefile      Tue May 15 09:10:05 2001 +0000
+++ b/gnu/usr.bin/cvs/cvs/Makefile      Tue May 15 09:56:30 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2001/03/28 09:18:38 joda Exp $
+#      $NetBSD: Makefile,v 1.5 2001/05/15 09:56:30 assar Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -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