headers
Mattieu Baptiste | 1 Jul 2006 12:11
Picon

More Canon scanners (usbdevs, uscanner.c)

Hi,

This diff add support for more Canon scanners in -current (from
NetBSD). Tested on i386 with a CanoScan Lide 30:

mattieu <at> vosgien: ~ $ usbdevs
addr 1: UHCI root hub, Intel
addr 1: UHCI root hub, Intel
 addr 2: CanoScan, Canon
addr 1: UHCI root hub, Intel
 addr 2: Biometric Coprocessor, STMicroelectronics
addr 1: UHCI root hub, Intel
addr 1: EHCI root hub, Intel
 addr 2: OneTouch, Maxtor
mattieu <at> vosgien: ~ $ dmesg | grep uscanner
uscanner0 at uhub1 port 2ugen0 at uhub2 port 2
uscanner0: Canon CanoScan, rev 1.10/1.00, addr 2

--- usbdevs     Sat Jul  1 11:15:23 2006
+++ usbdevs.test        Sat Jul  1 11:14:55 2006
 <at>  <at>  -754,7 +754,9  <at>  <at> 

 /* Canon, Inc. products */
 product CANON N656U            0x2206  CANOSCAN N656U
+product CANON N1220U           0x2207  CANOSCAN N1220U
 product CANON N670U            0x220d  CANOSCAN N670U
+product CANON N1240U           0x220e  CANOSCAN N1240U
 product CANON S10              0x3041  PowerShot S10
 product CANON S20              0x3043  PowerShot S20
 product CANON S100_US          0x3045  PowerShot S100
(Continue reading)

Permalink | Reply | 16 comments |
headers
Miod Vallat | 1 Jul 2006 12:38
Picon
Gravatar

Re: More Canon scanners (usbdevs, uscanner.c)

> This diff add support for more Canon scanners in -current (from
> NetBSD). Tested on i386 with a CanoScan Lide 30:

Applied. Thanks!

Miod
Permalink | Reply | 15 comments |
headers
vetinari | 1 Jul 2006 19:13
Picon
Favicon

Needless header inclusion in ntpd

ntp.c includes both ntpd.h and ntp.h while the former already includes the
latter.

Index: ntp.c
===================================================================
RCS file: /cvs/src/usr.sbin/ntpd/ntp.c,v
retrieving revision 1.67
diff -u -r1.67 ntp.c
--- ntp.c       10 Aug 2005 13:48:36 -0000      1.67
+++ ntp.c       1 Jul 2006 17:04:30 -0000
 <at>  <at>  -32,7 +32,6  <at>  <at> 
 #include <unistd.h>

 #include "ntpd.h"
-#include "ntp.h"

 #define        PFD_PIPE_MAIN   0
 #define        PFD_MAX         1

--

-- 
vetinari
Permalink | Reply | 1 comment |
headers
Otto Moerbeek | 1 Jul 2006 20:57

Re: Needless header inclusion in ntpd

On Sat, 1 Jul 2006, vetinari wrote:

> ntp.c includes both ntpd.h and ntp.h while the former already includes the
> latter.

comitted (and some other unneeded includes as well), thanks,

	-Otto
> 
> Index: ntp.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ntpd/ntp.c,v
> retrieving revision 1.67
> diff -u -r1.67 ntp.c
> --- ntp.c       10 Aug 2005 13:48:36 -0000      1.67
> +++ ntp.c       1 Jul 2006 17:04:30 -0000
>  <at>  <at>  -32,7 +32,6  <at>  <at> 
>  #include <unistd.h>
>  
>  #include "ntpd.h"
> -#include "ntp.h"
>  
>  #define        PFD_PIPE_MAIN   0
>  #define        PFD_MAX         1
> 
> 
> -- 
> vetinari
(Continue reading)

Permalink | Reply | 0 comments |
headers
Thorsten Glaser | 2 Jul 2006 01:08
Picon
Gravatar

buffer overflow in libXfont

Hello,

I first detected this on MirOS but after a phone call with a friend
running OpenBSD on his laptop, he could verify this works for him too.

Download http://switch.dl.sourceforge.net/sourceforge/darkgarden/darkgarden-1.1.ttf.zip
(a free "as in GNU" decorative font)

For reference, here's the checksum:
RMD160 (DarkGardenMK.ttf) = 8058fae7a1d284274bc0b3d0ddb0af879696d971

Put that into a separate directory, for example like this:

$ mkdir /tmp/x
$ cd /tmp/x
$ ftp http://switch.dl.sourceforge.net/sourceforge/darkgarden/darkgarden-1.1.ttf.zip
$ unzip -j darkgarden-1.1.ttf.zip darkgarden-1.1/DarkGardenMK.ttf
$ mkfontscale
$ mkfontdir

After this, the command 'cat fonts.dir' should output the following:
	1
	DarkGardenMK.ttf -misc-dark garden-medium-r-normal--0-0-0-0-p-0-iso10646-1

$ xset +fp /tmp/x
$ xset fp rehash
$ xlsfonts | fgrep dark

Check if it's there.
(Continue reading)

Permalink | Reply | 1 comment |
headers
Matthieu Herrb | 2 Jul 2006 18:59
Picon
Picon
Favicon

Re: buffer overflow in libXfont

Thorsten Glaser wrote:
> Hello,
> 
> I first detected this on MirOS but after a phone call with a friend
> running OpenBSD on his laptop, he could verify this works for him too.
> 
> Download http://switch.dl.sourceforge.net/sourceforge/darkgarden/darkgarden-1.1.ttf.zip
> (a free "as in GNU" decorative font)
> 
> For reference, here's the checksum:
> RMD160 (DarkGardenMK.ttf) = 8058fae7a1d284274bc0b3d0ddb0af879696d971
> 
> Put that into a separate directory, for example like this:
> 
> $ mkdir /tmp/x
> $ cd /tmp/x
> $ ftp http://switch.dl.sourceforge.net/sourceforge/darkgarden/darkgarden-1.1.ttf.zip
> $ unzip -j darkgarden-1.1.ttf.zip darkgarden-1.1/DarkGardenMK.ttf
> $ mkfontscale
> $ mkfontdir
> 
> After this, the command 'cat fonts.dir' should output the following:
> 	1
> 	DarkGardenMK.ttf -misc-dark garden-medium-r-normal--0-0-0-0-p-0-iso10646-1
> 
> $ xset +fp /tmp/x
> $ xset fp rehash
> $ xlsfonts | fgrep dark
> 
> Check if it's there.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mike Belopuhov | 3 Jul 2006 22:24
Picon

Updated joy(4) driver

Hi all,

This is an updated joy(4) driver from NetBSD.
It is untested since I have no joysticks themselves :)
Just hacked on boring evening.

If anybody is interested, you may apply the patch and add this lines
to your kernel config:

joy0            at isa? port 0x201
joy*            at isapnp?
joy*            at pci?

You may get something like this:

joy1 at pci0 dev 14 function 1 "Creative Labs PCI Gameport Joystick" rev 0x08
joy0 at isa0 port 0x201

The isapnp part is supposed to be the most flawy.

Cheers.

--- /dev/null	Sun Jul  2 01:14:12 2006
+++ sys/dev/ic/joy.c	Sat Jul  1 13:25:01 2006
 <at>  <at>  -0,0 +1,184  <at>  <at> 
+/*	$OpenBSD$	*/
+/*	$NetBSD: joy.c,v 1.9 2005/12/11 12:21:27 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1995 Jean-Marc Zucconi
(Continue reading)

Permalink | Reply | 0 comments |
headers
Varoudis | 4 Jul 2006 00:11
Picon

PLANEX GW-CF11X without firmware pre-loaded

Hello,
Im trying to use this card with openbsd-current with no luck.
This card in linux needs the firmware to be loaded every time on
insert before use.

wi0 at pcmcia1 function 0 "PLANEX COMMUNICATIONS INC., PLANEX GW-CF11X
Wireless CF Card, " port 8x0/64, irq 137
wi0: init failed
: unable to read station address

pccardctl ident
product info: "PLANEX COMMUNICATION INC.", "PLANEX GW-CF11X Wireless
CF Card", "", ""
manfid: 0xd601, 0x0010
function: 6 (network)

Should I stop trying and buy a new one or there is a hope?
I have read the topic in the OESF forum which had no good ending.
http://www.oesf.org/forums/index.php?showtopic=20116&st=0

Thnx,
Tasos Varoudis
-Daemons.gr-
Permalink | Reply | 1 comment |
headers
Jonathan Gray | 4 Jul 2006 03:23
Favicon

Re: PLANEX GW-CF11X without firmware pre-loaded

On Tue, Jul 04, 2006 at 01:11:14AM +0300, Varoudis wrote:
> Hello,
> Im trying to use this card with openbsd-current with no luck.
> This card in linux needs the firmware to be loaded every time on
> insert before use.

We currently don't support runtime firmware loading with wi(4).
So unless you want to play with the code a new one is probably
the easiest way to get something to work.

> 
> wi0 at pcmcia1 function 0 "PLANEX COMMUNICATIONS INC., PLANEX GW-CF11X
> Wireless CF Card, " port 8x0/64, irq 137
> wi0: init failed
> : unable to read station address
> 
> pccardctl ident
> product info: "PLANEX COMMUNICATION INC.", "PLANEX GW-CF11X Wireless
> CF Card", "", ""
> manfid: 0xd601, 0x0010
> function: 6 (network)
> 
> Should I stop trying and buy a new one or there is a hope?
> I have read the topic in the OESF forum which had no good ending.
> http://www.oesf.org/forums/index.php?showtopic=20116&st=0
> 
> Thnx,
> Tasos Varoudis
> -Daemons.gr-
(Continue reading)

Permalink | Reply | 0 comments |
headers
Matthew R. Dempsky | 4 Jul 2006 08:33

[PATCH] Buffer overflow in lib/libc/bcrypt.c

encode_salt() in lib/libc/bcrypt.c writes a 7 byte prefix, a base64 
encoding of a 16 byte string (16 * 4/3 rounded up bytes), and then a 
null terminator into the gsalt global variable which only has enough 
room for the base64 encoding.

Index: lib/libc/crypt/bcrypt.c
===================================================================
RCS file: /cvs/src/lib/libc/crypt/bcrypt.c,v
retrieving revision 1.20
diff -p -u -r1.20 bcrypt.c
--- lib/libc/crypt/bcrypt.c     3 Apr 2006 19:55:49 -0000       1.20
+++ lib/libc/crypt/bcrypt.c     4 Jul 2006 06:23:23 -0000
 <at>  <at>  -73,7 +73,7  <at>  <at>  static void encode_base64(u_int8_t *, u_
 static void decode_base64(u_int8_t *, u_int16_t, u_int8_t *);

 static char    encrypted[_PASSWORD_LEN];
-static char    gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
+static char    gsalt[7 + (BCRYPT_MAXSALT * 4 + 2) / 3 + 1];
 static char    error[] = ":";

 const static u_int8_t Base64Code[] =
Permalink | Reply | 1 comment |

Gmane