From owner-cvs-src@FreeBSD.ORG Tue Jun 3 03:50:07 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77E2B37B401; Tue, 3 Jun 2003 03:50:07 -0700 (PDT) Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA97B43F75; Tue, 3 Jun 2003 03:50:04 -0700 (PDT) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: from zibbi.icomtek.csir.co.za (localhost [IPv6:::1]) h53Ant5v077029; Tue, 3 Jun 2003 12:49:55 +0200 (SAST) (envelope-from jhay@zibbi.icomtek.csir.co.za) Received: (from jhay@localhost) by zibbi.icomtek.csir.co.za (8.12.9/8.12.9/Submit) id h53Ant1k077028; Tue, 3 Jun 2003 12:49:55 +0200 (SAST) (envelope-from jhay) Date: Tue, 3 Jun 2003 12:49:55 +0200 From: John Hay To: Mark Murray Message-ID: <20030603104955.GA76928@zibbi.icomtek.csir.co.za> References: <200306021906.h52J6TvX080958@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200306021906.h52J6TvX080958@repoman.freebsd.org> User-Agent: Mutt/1.4i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/bin/ed Makefile cbc.c ed.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2003 10:50:07 -0000 Hi Mark, On Mon, Jun 02, 2003 at 12:06:28PM -0700, Mark Murray wrote: > markm 2003/06/02 12:06:28 PDT > > FreeBSD src repository > > Modified files: > bin/ed Makefile cbc.c ed.h > Log: > Modernise. Use libcrypto for DES instead of libcipher. > > Revision Changes Path > 1.23 +2 -2 src/bin/ed/Makefile > 1.18 +37 -43 src/bin/ed/cbc.c > 1.19 +12 -7 src/bin/ed/ed.h This broke make release for me. it breaks inside release.3 when it tries to compile ed with NOCRYPT. This patch makes it compile again. John -- John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org Index: bin/ed/cbc.c =================================================================== RCS file: /home/ncvs/src/bin/ed/cbc.c,v retrieving revision 1.18 diff -u -r1.18 cbc.c --- bin/ed/cbc.c 2 Jun 2003 19:06:28 -0000 1.18 +++ bin/ed/cbc.c 3 Jun 2003 06:20:21 -0000 @@ -76,8 +76,10 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; +#ifdef DES DES_cblock ivec; /* initialization vector */ DES_cblock pvec; /* padding vector */ +#endif char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' @@ -85,7 +87,9 @@ int pflag; /* 1 to preserve parity bits */ +#ifdef DES DES_key_schedule schedule; /* expanded DES key */ +#endif unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */