From owner-cvs-all@FreeBSD.ORG  Tue Jun  3 05:43:27 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CA73437B401; Tue,  3 Jun 2003 05:43:27 -0700 (PDT)
Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.157.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B945043FB1; Tue,  3 Jun 2003 05:43:26 -0700 (PDT)
	(envelope-from mark@grondar.org)
Received: from storm.FreeBSD.org.uk (Ugrondar@localhost [127.0.0.1])
	by storm.FreeBSD.org.uk (8.12.9/8.12.9) with ESMTP id h53ChPuD094551;
	Tue, 3 Jun 2003 13:43:25 +0100 (BST)
	(envelope-from mark@grondar.org)
Received: (from Ugrondar@localhost)h53ChPYZ094550;
	Tue, 3 Jun 2003 13:43:25 +0100 (BST)
X-Authentication-Warning: storm.FreeBSD.org.uk: Ugrondar set sender to
	mark@grondar.org using -f
Received: from grondar.org (localhost [127.0.0.1])h53C0EHh021020;
	Tue, 3 Jun 2003 13:00:14 +0100 (BST)	(envelope-from mark@grondar.org)
From: Mark Murray <mark@grondar.org>
Message-Id: <200306031200.h53C0EHh021020@grimreaper.grondar.org>
To: John Hay <jhay@icomtek.csir.co.za>
In-Reply-To: Your message of "Tue, 03 Jun 2003 12:49:55 +0200."
             <20030603104955.GA76928@zibbi.icomtek.csir.co.za> 
Date: Tue, 03 Jun 2003 13:00:14 +0100
Sender: mark@grondar.org
X-Spam-Status: No, hits=0.2 required=5.0
	tests=EMAIL_ATTRIBUTION,FROM_NO_LOWER,IN_REP_TO,
	      QUOTED_EMAIL_TEXT,REPLY_WITH_QUOTES
	version=2.55
X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: Mark Murray <markm@FreeBSD.org>
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/bin/ed Makefile cbc.c ed.h 
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2003 12:43:29 -0000

John Hay writes:
> This broke make release for me. it breaks inside release.3 when it tries
> to compile ed with NOCRYPT.

Oops! Sorry.

> This patch makes it compile again.

This looks fine. Go right ahead and commit, if you like.

M

> 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 */
--
Mark Murray
iumop ap!sdn w,I idlaH