From owner-freebsd-stable@FreeBSD.ORG  Wed Dec  1 17:53:56 2010
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15AD8106564A
	for <stable@freebsd.org>; Wed,  1 Dec 2010 17:53:56 +0000 (UTC)
	(envelope-from bsd@lordcow.org)
Received: from lordcow.org (lordcow.org [41.203.5.188])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B0118FC16
	for <stable@freebsd.org>; Wed,  1 Dec 2010 17:53:54 +0000 (UTC)
Received: from lordcow.org (localhost [127.0.0.1])
	by lordcow.org (8.14.4/8.14.4) with ESMTP id oB1HrkHw045132
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <stable@freebsd.org>; Wed, 1 Dec 2010 19:53:46 +0200 (SAST)
	(envelope-from lordcow@lordcow.org)
Received: (from lordcow@localhost)
	by lordcow.org (8.14.4/8.14.4/Submit) id oB1HrfKD045131
	for stable@freebsd.org; Wed, 1 Dec 2010 19:53:41 +0200 (SAST)
	(envelope-from lordcow)
Date: Wed, 1 Dec 2010 19:53:41 +0200
From: Gareth de Vaux <bsd@lordcow.org>
To: stable@freebsd.org
Message-ID: <20101201175341.GA44800@lordcow.org>
References: <201011292119.oATLJt5b095914@freefall.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201011292119.oATLJt5b095914@freefall.freebsd.org>
User-Agent: Mutt/1.4.2.3i
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED
	autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on lordcow.org
Cc: 
Subject: Re: FreeBSD Security Advisory FreeBSD-SA-10:10.openssl
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Dec 2010 17:53:56 -0000

On Mon 2010-11-29 (21:19), FreeBSD Security Advisories wrote:
> # cd /usr/src
> # patch < /path/to/patch
> # cd /usr/src/secure/lib/libssl
> # make obj && make depend && make && make install

Hi all, I'm following the instructions with:

# cvsup /etc/cvsup-src.conf
# rm -rf /usr/obj   
# cd /usr/src/secure/lib/libssl
# make obj && make depend && make

[ snip ]

cc -O -pipe  -DTERMIOS -DANSI_SOURCE -I/usr/src/secure/lib/libssl/../../../crypto/openssl -I/usr/src/secure/lib/libssl/../../../crypto/openssl/crypto -I/usr/obj/usr/src/secure/lib/libssl -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_IDEA -DL_ENDIAN -DNO_IDEA -std=gnu99 -fstack-protector  -c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/d1_both.c
/usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/d1_both.c: In function 'dtls1_hm_fragment_new':
/usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/d1_both.c:210: error: 'hm_fragment' has no member named 'reassembly'

[ more hm_fragment.reassembly errors .. ]

*** Error code 1

Stop in /usr/src/secure/lib/libssl.


What's going on?

hm_fragment is (only) defined in /usr/src/crypto/openssl/ssl/dtls1.h:

typedef struct hm_fragment_st
	{
	struct hm_header_st msg_header;
	unsigned char *fragment;
	unsigned char *reassembly;
	} hm_fragment;

which has that member and is sourced from the Makefiles.

The first existence complaint in d1_both.c is:

frag->reassembly = bitmask;

yet

frag->fragment = buf;

a few lines earlier is fine?