Date: Wed, 29 Jan 2003 15:54:51 +0200 From: Ruslan Ermilov <ru@freebsd.org> To: Mark Murray <markm@freebsd.org>, Jacques Vidrine <nectar@freebsd.org> Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: src/crypto/openssl Message-ID: <20030129135451.GA12456@sunbay.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Hi! Revision 1.9 is responsible for a breakage I am still seeing: : RCS file: /home/ncvs/src/crypto/openssl/crypto/des/des.h,v : Working file: des.h : head: 1.9 : branch: : locks: strict : access list: : keyword substitution: kv : total revisions: 22; selected revisions: 9 : description: : ---------------------------- : revision 1.9 : date: 2003/01/28 22:34:19; author: markm; state: Exp; lines: +131 -161 : Merge conflicts. : This is cunning doublespeak for "use vendor code". : ---------------------------- : revision 1.8 : date: 2002/07/30 13:58:49; author: nectar; state: Exp; lines: +1 -1 : Resolve conflicts after import of OpenSSL 0.9.6e. : ---------------------------- Revision 1.8 had some local declaration stuff on behalf of rnd_keys.c, in particular des_new_random_key(): : allmouth# cvs di -u -rv0_9_6g -r1.8 des.h | grep -w des_new_random_key : +int des_new_random_key(des_cblock *key); Revision 1.9 does not include any local changes, and this upsets libtelnet build (this is on beast with fresh sources): : ===> secure/lib/libtelnet : cc -O -pipe -mcpu=pentiumpro -DENCRYPTION -DAUTHENTICATION -DSRA -I/j/ru/src-5/secure/lib/libtelnet/../../../crypto/telnet -I/j/ru/src-5/secure/lib/libtelnet/../../../crypto/telnet/libtelnet -DNO_IDEA -Werror -Wall -Wno-format-y2k -Wno-uninitialized -c /j/ru/src-5/crypto/telnet/libtelnet/enc_des.c -o enc_des.o : cc1: warnings being treated as errors : /j/ru/src-5/crypto/telnet/libtelnet/enc_des.c: In function `fb64_start': : /j/ru/src-5/crypto/telnet/libtelnet/enc_des.c:214: warning: implicit declaration of function `des_new_random_key' : *** Error code 1 : Stop in /j/ru/src-5/secure/lib/libtelnet. : *** Error code 1 Cheers, -- Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+N90rUkv4P6juNwoRAhpNAJ4/sIF1Cubu3j08tZQJhYPWgcoTTgCfV0Il zDU87dMnZLZS+LH75EpobXc= =qmx5 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030129135451.GA12456>