From owner-freebsd-questions@FreeBSD.ORG Fri Oct 5 00:35:15 2007 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAE5816A46D for ; Fri, 5 Oct 2007 00:35:15 +0000 (UTC) (envelope-from hakmi@rogers.com) Received: from smtp103.rog.mail.re2.yahoo.com (smtp103.rog.mail.re2.yahoo.com [206.190.36.81]) by mx1.freebsd.org (Postfix) with SMTP id B563613C447 for ; Fri, 5 Oct 2007 00:35:15 +0000 (UTC) (envelope-from hakmi@rogers.com) Received: (qmail 86255 invoked from network); 5 Oct 2007 00:35:14 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=rogers.com; h=Received:X-YMail-OSG:From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:X-Mailer:X-MimeOLE:Thread-Index; b=Q2rgo9RZ57Ei2YRPJBBfpaskfr5DNYDPUwu9+YP9J2F/dr81B+/Ex8x1IeqAYCZJbzga8x4a9X7//zgDjZ7is4SZW2mA0gjpBjFa+aFxNFm9aKHRoHBQhxF8xsrJC2Rvq4tmH4oiyVAQdfQrltIL9bBpplTe2oGtdJkKAYMuoGc= ; Received: from unknown (HELO tamouh) (hakmi@rogers.com@99.224.65.182 with login) by smtp103.rog.mail.re2.yahoo.com with SMTP; 5 Oct 2007 00:35:14 -0000 X-YMail-OSG: hd_2rrEVM1nuo7ipaUVz2qxUcz9P.P3espmI3Uo9CYfPyJ.m8AAVpkQh.0DLX9Q3iQ-- From: "Tamouh H." To: Date: Thu, 4 Oct 2007 20:36:43 -0400 Message-ID: <063401c806e7$ce145470$6900a8c0@tamouh> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Office Outlook 11 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3138 Thread-Index: AcgG582NE5DZV1ApSfK20ZVTSsmThQ== Subject: recent openssl patch is failing X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2007 00:35:16 -0000 Hello, I've tried patching the latest openssl on FreeBSD 6.1 as per: http://security.freebsd.org/advisories/FreeBSD-SA-07:08.openssl.asc However, the patching fails mainly due to some problems with the patch = on line 1162 , and I can't seem to find out the reason for it. This had = failed on multiple FBSD machines, so I'm pretty sure it is the patch. Here is what the patch is producing: openssl.patch 100% of 1051 B 5237 kBps Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: crypto/openssl/ssl/ssl_lib.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |RCS file: /home/ncvs/src/crypto/openssl/ssl/ssl_lib.c,v |retrieving revision 1.1.1.12.2.1 |diff -u -d -r1.1.1.12.2.1 ssl_lib.c |--- crypto/openssl/ssl/ssl_lib.c 28 Sep 2006 13:02:36 -0000 = 1.1.1.12.2.1 |+++ crypto/openssl/ssl/ssl_lib.c 3 Oct 2007 17:01:24 -0000 -------------------------- Patching file crypto/openssl/ssl/ssl_lib.c using Plan A... Hunk #1 succeeded at 1149. Hunk #2 failed at 1161. 1 out of 2 hunks failed--saving rejects to = crypto/openssl/ssl/ssl_lib.c.rej done =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D This is what ssl_lib.c.rej shows: *************** *** 1162,1181 **** sk=3Ds->session->ciphers; for (i=3D0; iname; *cp; ) { - if (len-- <=3D 0) - { - *p=3D'\0'; - return(buf); - } - else - *(p++)=3D *(cp++); } *(p++)=3D':'; } p[-1]=3D'\0'; return(buf); --- 1161,1181 ---- sk=3Ds->session->ciphers; for (i=3D0; iname); + if (n+1 > len) { + if (p !=3D buf) + --p; + *p=3D'\0'; + return buf; } + strcpy(p,c->name); + p+=3Dn; *(p++)=3D':'; + len-=3Dn+1; } p[-1]=3D'\0'; return(buf); =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D This is the error when doing make: /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_lib.c: In = function `SSL_get_shared_ciphers': /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_lib.c:1167: = error: `cp' undeclared (first use in this function) /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_lib.c:1167: = error: (Each undeclared identifier is reported only once /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_lib.c:1167: = error: for each function it appears in.) *** Error code 1 Anyone have tried the patch and experiencing the same issue ? Thanks, Tamouh Hakmi