Date: Tue, 03 Jun 2003 13:00:14 +0100 From: Mark Murray <mark@grondar.org> To: John Hay <jhay@icomtek.csir.co.za> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/bin/ed Makefile cbc.c ed.h Message-ID: <200306031200.h53C0EHh021020@grimreaper.grondar.org> In-Reply-To: Your message of "Tue, 03 Jun 2003 12:49:55 %2B0200." <20030603104955.GA76928@zibbi.icomtek.csir.co.za>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306031200.h53C0EHh021020>