CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: alc
Date: Mon Jul 6 00:54:01 UTC 2009
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
Add a pmf(9) shutdown hook to acpiec(4) to use polling on shutdown.
This fixes DIAGNOSTIC's assertion failure:
cpu_switchto(): switching above IPL_SCHED
during ACPI shutdown.
OK'd by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/acpi/acpi_ec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.55 src/sys/dev/acpi/acpi_ec.c:1.56
--- src/sys/dev/acpi/acpi_ec.c:1.55 Tue May 12 09:29:46 2009
+++ src/sys/dev/acpi/acpi_ec.c Mon Jul 6 00:54:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.55 2009/05/12 09:29:46 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $");
#include
#include
@@ -148,8 +148,9 @@
static void acpiec_common_attach(device_t, device_t, ACPI_HANDLE,
bus_addr_t, bus_addr_t, ACPI_HANDLE, uint8_t);
-static bool acpiec_resume(device_t PMF_FN_PROTO);
static bool acpiec_suspend(device_t PMF_FN_PROTO);
+static bool acpiec_resume(device_t PMF_FN_PROTO);
+static bool acpiec_shutdown(device_t, int);
static bool acpiec_parse_gpe_package(device_t, ACPI_HANDLE,
ACPI_HANDLE *, uint8_t *);
@@ -377,7 +378,8 @@
ec_singleton = self;
- if (!pmf_device_register(self, acpiec_suspend, acpiec_resume))
+ if (!pmf_device_register1(self, acpiec_suspend, acpiec_resume,
+ acpiec_shutdown))
aprint_error_dev(self, "couldn't establish power handler\n");
return;
@@ -409,6 +411,14 @@
}
static bool
+acpiec_shutdown(device_t dv, int how)
+{
+
+ acpiec_cold = true;
+ return true;
+}
+
+static bool
acpiec_parse_gpe_package(device_t self, ACPI_HANDLE ec_handle,
ACPI_HANDLE *gpe_handle, uint8_t *gpebit)
{
CVS commit: src/sys/arch/mips/atheros
Module Name:src
Committed By: alc
Date: Mon Jul 6 00:43:23 UTC 2009
Modified Files:
src/sys/arch/mips/atheros: ar5312_board.c ar5315.c ar5315_board.c
src/sys/arch/mips/atheros/dev: if_ath_arbus.c
src/sys/arch/mips/atheros/include: ar5312reg.h
Log Message:
Update reference to the Atheros HAL exported headers.
`external/isc/atheros_hal/dist', former `contrib/dev/ath/' is now in cpp(1)'s
include path.
Fix build of MERAKI kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/atheros/ar5312_board.c \
src/sys/arch/mips/atheros/ar5315_board.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/atheros/ar5315.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/atheros/dev/if_ath_arbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/include/ar5312reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/atheros/ar5312_board.c
diff -u src/sys/arch/mips/atheros/ar5312_board.c:1.1 src/sys/arch/mips/atheros/ar5312_board.c:1.2
--- src/sys/arch/mips/atheros/ar5312_board.c:1.1 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/mips/atheros/ar5312_board.c Mon Jul 6 00:43:22 2009
@@ -1,4 +1,4 @@
-/* $Id: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $Id: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -40,7 +40,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $");
#include
#include
@@ -50,7 +50,7 @@
#include
#include
-#include
+#include
extern const char *ether_sprintf(const uint8_t *);
Index: src/sys/arch/mips/atheros/ar5315_board.c
diff -u src/sys/arch/mips/atheros/ar5315_board.c:1.1 src/sys/arch/mips/atheros/ar5315_board.c:1.2
--- src/sys/arch/mips/atheros/ar5315_board.c:1.1 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/mips/atheros/ar5315_board.c Mon Jul 6 00:43:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $NetBSD: ar5315_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -46,7 +46,7 @@
* information data in flash for the AR5315.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.2 2009/07/06 00:43:22 alc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -66,7 +66,7 @@
#include
#include
-#include /* XXX really doesn't belong in hal */
+#include /* XXX really doesn't belong in hal */
#include
#include
Index: src/sys/arch/mips/atheros/ar5315.c
diff -u src/sys/arch/mips/atheros/ar5315.c:1.5 src/sys/arch/mips/atheros/ar5315.c:1.6
--- src/sys/arch/mips/atheros/ar5315.c:1.5 Wed Jan 23 05:23:59 2008
+++ src/sys/arch/mips/atheros/ar5315.c Mon Jul 6 00:43:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
+/* $NetBSD: ar5315.c,v 1.6 2009/07/06 00:43:22 alc Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -48,7 +48,7 @@
* family.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.6 2009/07/06 00:43:22 alc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -69,7 +69,7 @@
#include
-#include /* XXX really doesn't belong in hal */
+#include /* XXX really doesn't belong in hal */
#include
#include
Index: src/sys/arch/mips/atheros/dev/if_ath_arbus.c
diff -u src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.15 src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.16
--- src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.15 Wed Jul 9 19:47:23 2008
+++ src/sys/arch/mips/atheros/dev/if_ath_arbus.c Mon Jul 6 00:43:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $");
#include
#include
@@ -64,8 +64,9 @@
#include
#include
#include
-#include
-#include /* XXX really doesn't belong in hal */
+
+#include
+#include /* XXX really doesn't belong in hal */
struct ath_arbus_softc {
struct ath_softc sc_ath;
Index: src/sys/arch/mips/atheros/include/ar5312reg.h
diff -u src/sys/arch/mips/atheros/include/ar5312reg.h:1.2 src/sys/arch/mips/atheros/include/ar5312reg.h:1.3
--- src/sys/arch/mips/atheros/include/ar5312reg.h:1.2 Mon Sep 4 05:17:26 2006
+++ src/sys/arch/mips/a
CVS commit: src/lib/libedit
Module Name:src Committed By: perry Date: Sun Jul 5 21:55:24 UTC 2009 Modified Files: src/lib/libedit: editline.3 Log Message: note that the return value of el_gets doesn't remain valid across calls. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/lib/libedit/editline.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editline.3 diff -u src/lib/libedit/editline.3:1.69 src/lib/libedit/editline.3:1.70 --- src/lib/libedit/editline.3:1.69 Tue May 12 08:14:07 2009 +++ src/lib/libedit/editline.3 Sun Jul 5 21:55:24 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: editline.3,v 1.69 2009/05/12 08:14:07 wiz Exp $ +.\" $NetBSD: editline.3,v 1.70 2009/07/05 21:55:24 perry Exp $ .\" .\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -26,7 +26,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 11, 2009 +.Dd July 5, 2009 .Dt EDITLINE 3 .Os .Sh NAME @@ -162,6 +162,9 @@ is set to \-1 and .Dv errno contains the error code that caused it. +The return value may not remain valid across calls to +.Fn el_gets +and must be copied if the data is to be retained. .It Fn el_getc Read a character from the tty. .Fa ch
CVS commit: src/etc
Module Name:src Committed By: mrg Date: Sun Jul 5 21:35:16 UTC 2009 Modified Files: src/etc: MAKEDEV.tmpl Log Message: fix previous to actually pay attention to the unit number. noted by drochner. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.126 src/etc/MAKEDEV.tmpl:1.127 --- src/etc/MAKEDEV.tmpl:1.126 Fri Jul 3 06:33:56 2009 +++ src/etc/MAKEDEV.tmpl Sun Jul 5 21:35:16 2009 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.126 2009/07/03 06:33:56 mrg Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.127 2009/07/05 21:35:16 mrg Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1904,7 +1904,7 @@ dri*) makedir dri 755 - mkdev dri/card$unit c %dri_chr% 2 660 + mkdev dri/card$unit c %dri_chr% $unit 660 ;; drvctl)
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jul 5 21:30:30 UTC 2009 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/server/xorg-server/include: Makefile Log Message: install geext.h. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.97 src/distrib/sets/lists/xcomp/mi:1.98 --- src/distrib/sets/lists/xcomp/mi:1.97 Thu Jun 18 21:05:35 2009 +++ src/distrib/sets/lists/xcomp/mi Sun Jul 5 21:30:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.97 2009/06/18 21:05:35 mrg Exp $ +# $NetBSD: mi,v 1.98 2009/07/05 21:30:30 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5779,6 +5779,7 @@ ./usr/X11R7/include/xorg/fourcc.h -unknown- xorg ./usr/X11R7/include/xorg/gc.h-unknown- xorg ./usr/X11R7/include/xorg/gcstruct.h -unknown- xorg +./usr/X11R7/include/xorg/geext.h -unknown- xorg ./usr/X11R7/include/xorg/globals.h -unknown- xorg ./usr/X11R7/include/xorg/glyphstr.h -unknown- xorg ./usr/X11R7/include/xorg/hotplug.h -unknown- xorg Index: src/external/mit/xorg/server/xorg-server/include/Makefile diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.6 src/external/mit/xorg/server/xorg-server/include/Makefile:1.7 --- src/external/mit/xorg/server/xorg-server/include/Makefile:1.6 Fri Jun 12 01:59:07 2009 +++ src/external/mit/xorg/server/xorg-server/include/Makefile Sun Jul 5 21:30:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/06/12 01:59:07 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2009/07/05 21:30:30 mrg Exp $ .include @@ -28,7 +28,7 @@ dbestruct.h dgaproc.h dix.h dixevents.h dixfont.h dixfontstr.h \ dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \ extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \ - fbrop.h fi1236.h fourcc.h gc.h gcstruct.h globals.h \ + fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ glyphstr.h i2c_def.h input.h inputstr.h \ mi.h mibank.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \ migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: snj Date: Sun Jul 5 14:28:17 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 851. To generate a diff of this commit: cvs rdiff -u -r1.1.2.163 -r1.1.2.164 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.163 src/doc/CHANGES-4.1:1.1.2.164 --- src/doc/CHANGES-4.1:1.1.2.163 Sun Jul 5 00:55:39 2009 +++ src/doc/CHANGES-4.1 Sun Jul 5 14:28:17 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.163 2009/07/05 00:55:39 snj Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.164 2009/07/05 14:28:17 snj Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3562,3 +3562,8 @@ Another OpenSSL security update. [tonnerre, ticket #1334] +crypto/dist/openssl/ssl/d1_both.c patch + + Fix build problem introduced with ticket 1334. + [spz, ticket #851] +
CVS commit: [netbsd-4] src/crypto/dist/openssl/ssl
Module Name:src Committed By: snj Date: Sun Jul 5 14:27:39 UTC 2009 Modified Files: src/crypto/dist/openssl/ssl [netbsd-4]: d1_both.c Log Message: Apply patch (requested by spz in ticket #1335): Build fix for OpenSSL. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \ src/crypto/dist/openssl/ssl/d1_both.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/d1_both.c diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.2 src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.3 --- src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.2 Sun Jul 5 00:53:05 2009 +++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 14:27:39 2009 @@ -563,10 +563,10 @@ goto err; /* Try to find item in queue, to prevent duplicate entries */ - memset(seq64be,0,sizeof(seq64be)); - seq64be[6] = (unsigned char) (msg_hdr->seq>>8); - seq64be[7] = (unsigned char) msg_hdr->seq; - item = pqueue_find(s->d1->buffered_messages, seq64be); + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pqueue_find(s->d1->buffered_messages, seq64); + pq_64bit_free(&seq64); /* Discard the message if sequence number was already there, is * too far in the future or the fragment is already in the queue */
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: snj Date: Sun Jul 5 14:26:51 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 851. To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.43 src/doc/CHANGES-4.0.2:1.1.2.44 --- src/doc/CHANGES-4.0.2:1.1.2.43 Sun Jul 5 00:59:07 2009 +++ src/doc/CHANGES-4.0.2 Sun Jul 5 14:26:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.43 2009/07/05 00:59:07 snj Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.44 2009/07/05 14:26:51 snj Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -712,3 +712,8 @@ Another OpenSSL security update. [tonnerre, ticket #1334] +crypto/dist/openssl/ssl/d1_both.c patch + + Fix build problem introduced with ticket 1334. + [spz, ticket #851] +
CVS commit: [netbsd-4-0] src/crypto/dist/openssl/ssl
Module Name:src Committed By: snj Date: Sun Jul 5 14:25:21 UTC 2009 Modified Files: src/crypto/dist/openssl/ssl [netbsd-4-0]: d1_both.c Log Message: Apply patch (requested by spz in ticket #1335): Build fix for OpenSSL. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1.4.1.2.1 -r1.1.1.1.4.1.2.2 \ src/crypto/dist/openssl/ssl/d1_both.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/d1_both.c diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.1.2.1 src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.1.2.2 --- src/crypto/dist/openssl/ssl/d1_both.c:1.1.1.1.4.1.2.1 Sun Jul 5 00:57:34 2009 +++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 14:25:21 2009 @@ -563,10 +563,10 @@ goto err; /* Try to find item in queue, to prevent duplicate entries */ - memset(seq64be,0,sizeof(seq64be)); - seq64be[6] = (unsigned char) (msg_hdr->seq>>8); - seq64be[7] = (unsigned char) msg_hdr->seq; - item = pqueue_find(s->d1->buffered_messages, seq64be); + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pqueue_find(s->d1->buffered_messages, seq64); + pq_64bit_free(&seq64); /* Discard the message if sequence number was already there, is * too far in the future or the fragment is already in the queue */
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Jul 5 14:22:00 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 851. To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.44 src/doc/CHANGES-5.1:1.1.2.45 --- src/doc/CHANGES-5.1:1.1.2.44 Sun Jul 5 00:35:37 2009 +++ src/doc/CHANGES-5.1 Sun Jul 5 14:22:00 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.44 2009/07/05 00:35:37 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.45 2009/07/05 14:22:00 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1501,3 +1501,8 @@ CVE-2009-1386 and CVE-2009-1387. [tonnerre, ticket #850] +crypto/dist/openssl/ssl/d1_both.c 1.5 + + Fix build problem from ticket 850 on non-64bit systems. + [spz, ticket #851] +
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Jul 5 14:21:41 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: Ticket 851. To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-5.0.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.32 src/doc/CHANGES-5.0.1:1.1.2.33 --- src/doc/CHANGES-5.0.1:1.1.2.32 Sun Jul 5 00:32:47 2009 +++ src/doc/CHANGES-5.0.1 Sun Jul 5 14:21:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.32 2009/07/05 00:32:47 snj Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.33 2009/07/05 14:21:40 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -574,3 +574,8 @@ CVE-2009-1386 and CVE-2009-1387. [tonnerre, ticket #850] +crypto/dist/openssl/ssl/d1_both.c 1.5 + + Fix build problem from ticket 850 on non-64bit systems. + [spz, ticket #851] +
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src Committed By: snj Date: Sun Jul 5 14:20:51 UTC 2009 Modified Files: src/crypto/dist/openssl/ssl [netbsd-5-0]: d1_both.c Log Message: Pull up following revision(s) (requested by spz in ticket #851): crypto/dist/openssl/ssl/d1_both.c: revision 1.5 fix break for non-64bit systems due to non-applying macro resp variable having crept in with the last patch. ok martin, compile tested mbalmer and martin To generate a diff of this commit: cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/crypto/dist/openssl/ssl/d1_both.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/d1_both.c diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.3.8.1 src/crypto/dist/openssl/ssl/d1_both.c:1.3.8.2 --- src/crypto/dist/openssl/ssl/d1_both.c:1.3.8.1 Sun Jul 5 14:19:35 2009 +++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 14:20:51 2009 @@ -598,11 +598,11 @@ if (i<=0 || (unsigned long)i!=frag_len) goto err; - pq_64bit_init(&seq64); - pq_64bit_assign_word(&seq64, msg_hdr->seq); + memset(seq64be,0,sizeof(seq64be)); + seq64be[6] = (unsigned char)(msg_hdr->seq>>8); + seq64be[7] = (unsigned char)(msg_hdr->seq); item = pitem_new(seq64be, frag); - pq_64bit_free(&seq64); if ( item == NULL) goto err;
CVS commit: [netbsd-5-0] src/crypto/dist/openssl/ssl
Module Name:src
Committed By: snj
Date: Sun Jul 5 14:19:35 UTC 2009
Modified Files:
src/crypto/dist/openssl/ssl [netbsd-5-0]: d1_both.c
Log Message:
Pull up following revision(s) (requested by tonnerre in ticket #850):
crypto/dist/openssl/ssl/d1_both.c: revision 1.4
Forgot to commit this last night with the rest of ticket 850. Sigh.
"Fix various vulnerabilities in OpenSSL which have not previously been
addressed: CVE-2009-1377, CVE-2009-1378, CVE-2009-1379, CVE-2009-1386
and CVE-2009-1387.
Changes deal mostly with size checking of various elements and fixes
to various error paths."
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/crypto/dist/openssl/ssl/d1_both.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/openssl/ssl/d1_both.c
diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.3 src/crypto/dist/openssl/ssl/d1_both.c:1.3.8.1
--- src/crypto/dist/openssl/ssl/d1_both.c:1.3 Fri May 9 21:49:42 2008
+++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 14:19:35 2009
@@ -518,6 +518,7 @@
if ( s->d1->handshake_read_seq == frag->msg_header.seq)
{
+ unsigned long frag_len = frag->msg_header.frag_len;
pqueue_pop(s->d1->buffered_messages);
al=dtls1_preprocess_fragment(s,&frag->msg_header,max);
@@ -535,7 +536,7 @@
if (al==0)
{
*ok = 1;
- return frag->msg_header.frag_len;
+ return frag_len;
}
ssl3_send_alert(s,SSL3_AL_FATAL,al);
@@ -560,7 +561,16 @@
if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
goto err;
- if (msg_hdr->seq <= s->d1->handshake_read_seq)
+ /* Try to find item in queue, to prevent duplicate entries */
+ memset(seq64be,0,sizeof(seq64be));
+ seq64be[6] = (unsigned char) (msg_hdr->seq>>8);
+ seq64be[7] = (unsigned char) msg_hdr->seq;
+ item = pqueue_find(s->d1->buffered_messages, seq64be);
+
+ /* Discard the message if sequence number was already there, is
+ * too far in the future or the fragment is already in the queue */
+ if (msg_hdr->seq <= s->d1->handshake_read_seq ||
+ msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL)
{
unsigned char devnull [256];
@@ -574,30 +584,31 @@
}
}
- frag = dtls1_hm_fragment_new(frag_len);
- if ( frag == NULL)
- goto err;
+ if (frag_len)
+ {
+ frag = dtls1_hm_fragment_new(frag_len);
+ if ( frag == NULL)
+ goto err;
- memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
+ memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
- if (frag_len)
- {
/* read the body of the fragment (header has already been read */
i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
frag->fragment,frag_len,0);
if (i<=0 || (unsigned long)i!=frag_len)
goto err;
- }
- memset(seq64be,0,sizeof(seq64be));
- seq64be[6] = (unsigned char)(msg_hdr->seq>>8);
- seq64be[7] = (unsigned char)(msg_hdr->seq);
+ pq_64bit_init(&seq64);
+ pq_64bit_assign_word(&seq64, msg_hdr->seq);
- item = pitem_new(seq64be, frag);
- if ( item == NULL)
- goto err;
+ item = pitem_new(seq64be, frag);
+ pq_64bit_free(&seq64);
+ if ( item == NULL)
+ goto err;
+
+ pqueue_insert(s->d1->buffered_messages, item);
+ }
- pqueue_insert(s->d1->buffered_messages, item);
return DTLS1_HM_FRAGMENT_RETRY;
err:
CVS commit: [netbsd-5] src/crypto/dist/openssl/ssl
Module Name:src Committed By: snj Date: Sun Jul 5 14:11:17 UTC 2009 Modified Files: src/crypto/dist/openssl/ssl [netbsd-5]: d1_both.c Log Message: Pull up following revision(s) (requested by spz in ticket #851): crypto/dist/openssl/ssl/d1_both.c: revision 1.5 fix break for non-64bit systems due to non-applying macro resp variable having crept in with the last patch. ok martin, compile tested mbalmer and martin To generate a diff of this commit: cvs rdiff -u -r1.3.4.1 -r1.3.4.2 src/crypto/dist/openssl/ssl/d1_both.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/d1_both.c diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.3.4.1 src/crypto/dist/openssl/ssl/d1_both.c:1.3.4.2 --- src/crypto/dist/openssl/ssl/d1_both.c:1.3.4.1 Sun Jul 5 00:34:52 2009 +++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 14:11:17 2009 @@ -598,11 +598,11 @@ if (i<=0 || (unsigned long)i!=frag_len) goto err; - pq_64bit_init(&seq64); - pq_64bit_assign_word(&seq64, msg_hdr->seq); + memset(seq64be,0,sizeof(seq64be)); + seq64be[6] = (unsigned char)(msg_hdr->seq>>8); + seq64be[7] = (unsigned char)(msg_hdr->seq); item = pitem_new(seq64be, frag); - pq_64bit_free(&seq64); if ( item == NULL) goto err;
CVS commit: src/crypto/dist/openssl/ssl
Module Name:src Committed By: spz Date: Sun Jul 5 11:35:54 UTC 2009 Modified Files: src/crypto/dist/openssl/ssl: d1_both.c Log Message: fix break for non-64bit systems due to non-applying macro resp variable having crept in with the last patch. ok martin, compile tested mbalmer and martin To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/openssl/ssl/d1_both.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/openssl/ssl/d1_both.c diff -u src/crypto/dist/openssl/ssl/d1_both.c:1.4 src/crypto/dist/openssl/ssl/d1_both.c:1.5 --- src/crypto/dist/openssl/ssl/d1_both.c:1.4 Sat Jul 4 19:52:10 2009 +++ src/crypto/dist/openssl/ssl/d1_both.c Sun Jul 5 11:35:53 2009 @@ -598,11 +598,11 @@ if (i<=0 || (unsigned long)i!=frag_len) goto err; - pq_64bit_init(&seq64); - pq_64bit_assign_word(&seq64, msg_hdr->seq); + memset(seq64be,0,sizeof(seq64be)); + seq64be[6] = (unsigned char)(msg_hdr->seq>>8); + seq64be[7] = (unsigned char)(msg_hdr->seq); item = pitem_new(seq64be, frag); - pq_64bit_free(&seq64); if ( item == NULL) goto err;
