From owner-p4-projects@FreeBSD.ORG Wed Mar 26 19:30:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58CF8106567C; Wed, 26 Mar 2008 19:30:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F01941065679 for ; Wed, 26 Mar 2008 19:30:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E25648FC1C for ; Wed, 26 Mar 2008 19:30:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2QJUCOR079166 for ; Wed, 26 Mar 2008 19:30:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2QJUBZO079164 for perforce@freebsd.org; Wed, 26 Mar 2008 19:30:11 GMT (envelope-from imp@freebsd.org) Date: Wed, 26 Mar 2008 19:30:11 GMT Message-Id: <200803261930.m2QJUBZO079164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 138652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2008 19:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=138652 Change 138652 by imp@imp_paco-paco on 2008/03/26 19:29:51 IFC @138642 Affected files ... .. //depot/projects/mips2/src/Makefile#8 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#16 integrate .. //depot/projects/mips2/src/bin/sh/options.c#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/Makefile#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/README#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/aes_wrap.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/aes_wrap.h#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/common.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/common.h#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/defconfig#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/driver.h#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/driver_test.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_sim.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_sim_common.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_sim_db.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/eap_tls_common.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/mips2/src/contrib/hostapd/hostapd.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/hostapd.conf#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/ieee802_11.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/ieee802_11_auth.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/os.h#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/mips2/src/contrib/hostapd/radius.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/radius.h#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/version.h#3 integrate .. //depot/projects/mips2/src/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/Makefile#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/aes_wrap.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/aes_wrap.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/asn1.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/common.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/config_ssid.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/config_winreg.c#2 delete .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete .. //depot/projects/mips2/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/defconfig#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/driver_hostap.h#3 delete .. //depot/projects/mips2/src/contrib/wpa_supplicant/driver_ndis.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_sim.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_sim_common.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_tlv.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eap_tlv.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eapol_test.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/eloop_win.c#2 delete .. //depot/projects/mips2/src/contrib/wpa_supplicant/events.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/main.c#4 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/os.h#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/radius.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/radius.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/radius_client.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/mips2/src/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_cli.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/mips2/src/contrib/wpa_supplicant/x509v3.c#2 integrate .. //depot/projects/mips2/src/etc/freebsd-update.conf#4 integrate .. //depot/projects/mips2/src/etc/periodic/security/410.logincheck#2 integrate .. //depot/projects/mips2/src/include/pthread.h#3 integrate .. //depot/projects/mips2/src/include/time.h#2 integrate .. //depot/projects/mips2/src/lib/libarchive/Makefile#7 integrate .. //depot/projects/mips2/src/lib/libc/gen/lockf.c#2 integrate .. //depot/projects/mips2/src/lib/libc/include/namespace.h#3 integrate .. //depot/projects/mips2/src/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#8 integrate .. //depot/projects/mips2/src/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/mips2/src/lib/libc/yp/xdryp.c#2 integrate .. //depot/projects/mips2/src/lib/libc_r/uthread/uthread_sig.c#3 integrate .. //depot/projects/mips2/src/lib/libelf/libelf_convert.m4#3 integrate .. //depot/projects/mips2/src/lib/libkse/thread/thr_sig.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/Makefile#8 integrate .. //depot/projects/mips2/src/lib/libthr/pthread.map#8 integrate .. //depot/projects/mips2/src/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_attr.c#5 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_exit.c#6 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/mips2/src/lib/libthread_db/Makefile#5 integrate .. //depot/projects/mips2/src/lib/libthread_db/kse.h#1 branch .. //depot/projects/mips2/src/lib/libthread_db/libc_r_db.c#2 integrate .. //depot/projects/mips2/src/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/mips2/src/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/mips2/src/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/mips2/src/libexec/talkd/announce.c#2 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/mips2/src/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/mips2/src/sbin/devd/token.l#2 integrate .. //depot/projects/mips2/src/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.8#5 integrate .. //depot/projects/mips2/src/sbin/route/route.c#3 integrate .. //depot/projects/mips2/src/share/man/man4/bpf.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/malo.4#1 branch .. //depot/projects/mips2/src/share/man/man7/security.7#4 integrate .. //depot/projects/mips2/src/share/man/man9/malloc.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/mbchain.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/mbuf.9#5 integrate .. //depot/projects/mips2/src/share/zoneinfo/asia#6 integrate .. //depot/projects/mips2/src/share/zoneinfo/backward#5 integrate .. //depot/projects/mips2/src/share/zoneinfo/northamerica#7 integrate .. //depot/projects/mips2/src/share/zoneinfo/southamerica#8 integrate .. //depot/projects/mips2/src/share/zoneinfo/zone.tab#7 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/prof_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/include/clock.h#4 integrate .. //depot/projects/mips2/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/mips2/src/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/mips2/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/mips2/src/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/mips2/src/sys/boot/pc98/cdboot/cdboot.s#4 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#17 integrate .. //depot/projects/mips2/src/sys/conf/files#21 integrate .. //depot/projects/mips2/src/sys/conf/options#15 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/ddb/db_command.c#6 integrate .. //depot/projects/mips2/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/mips2/src/sys/ddb/ddb.h#4 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac.c#7 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/mips2/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/mips2/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/mips2/src/sys/dev/en/midway.c#4 integrate .. //depot/projects/mips2/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/mips2/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/mips2/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/mips2/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/mips2/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/mips2/src/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/mips2/src/sys/dev/iscsi/initiator/isc_soc.c#4 integrate .. //depot/projects/mips2/src/sys/dev/malo/if_malo.c#1 branch .. //depot/projects/mips2/src/sys/dev/malo/if_malo.h#1 branch .. //depot/projects/mips2/src/sys/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/mips2/src/sys/dev/malo/if_malohal.c#1 branch .. //depot/projects/mips2/src/sys/dev/malo/if_malohal.h#1 branch .. //depot/projects/mips2/src/sys/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/mips2/src/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/mips2/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/mips2/src/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/mips2/src/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/mips2/src/sys/geom/geom.h#5 integrate .. //depot/projects/mips2/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/mips2/src/sys/i386/include/clock.h#4 integrate .. //depot/projects/mips2/src/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/mips2/src/sys/i386/isa/clock.c#8 integrate .. //depot/projects/mips2/src/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/mips2/src/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/mips2/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/mips2/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_thr.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_thread.c#12 integrate .. //depot/projects/mips2/src/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/mips2/src/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/mips2/src/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/mips2/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/mips2/src/sys/kern/subr_trap.c#8 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#10 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#11 integrate .. //depot/projects/mips2/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/mips2/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/mips2/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/mips2/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/mips2/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/mips2/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_apm/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_bsd/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_gpt/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_mbr/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/malo/Makefile#1 branch .. //depot/projects/mips2/src/sys/net/bpf.c#11 integrate .. //depot/projects/mips2/src/sys/net/bpf.h#5 integrate .. //depot/projects/mips2/src/sys/net/bpf_buffer.c#1 branch .. //depot/projects/mips2/src/sys/net/bpf_buffer.h#1 branch .. //depot/projects/mips2/src/sys/net/bpf_zerocopy.c#1 branch .. //depot/projects/mips2/src/sys/net/bpf_zerocopy.h#1 branch .. //depot/projects/mips2/src/sys/net/bpfdesc.h#4 integrate .. //depot/projects/mips2/src/sys/net/if.c#10 integrate .. //depot/projects/mips2/src/sys/net/if_ef.c#2 integrate .. //depot/projects/mips2/src/sys/net/if_enc.c#7 integrate .. //depot/projects/mips2/src/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/mips2/src/sys/net/if_loop.c#5 integrate .. //depot/projects/mips2/src/sys/net/if_media.h#5 integrate .. //depot/projects/mips2/src/sys/net/if_sl.c#3 integrate .. //depot/projects/mips2/src/sys/net/if_var.h#6 integrate .. //depot/projects/mips2/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/mips2/src/sys/netatalk/aarp.c#5 integrate .. //depot/projects/mips2/src/sys/netatm/port.h#2 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/mips2/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/mips2/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/mips2/src/sys/netipsec/key.c#5 integrate .. //depot/projects/mips2/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/mips2/src/sys/netncp/ncp_sock.c#6 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_rq.c#3 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/mips2/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/mips2/src/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/mips2/src/sys/nfsclient/krpc_subr.c#3 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/mips2/src/sys/nlm/nlm.h#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot.h#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot_server.c#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/mips2/src/sys/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/mips2/src/sys/nlm/sm_inter.h#1 branch .. //depot/projects/mips2/src/sys/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/mips2/src/sys/pc98/cbus/clock.c#6 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/syscons_cbus.c#3 integrate .. //depot/projects/mips2/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/mips2/src/sys/pci/if_mn.c#3 integrate .. //depot/projects/mips2/src/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/mips2/src/sys/pci/if_xl.c#6 integrate .. //depot/projects/mips2/src/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/mips2/src/sys/rpc/auth.h#1 branch .. //depot/projects/mips2/src/sys/rpc/auth_none.c#1 branch .. //depot/projects/mips2/src/sys/rpc/auth_unix.c#1 branch .. //depot/projects/mips2/src/sys/rpc/authunix_prot.c#1 branch .. //depot/projects/mips2/src/sys/rpc/clnt.h#1 branch .. //depot/projects/mips2/src/sys/rpc/clnt_dg.c#1 branch .. //depot/projects/mips2/src/sys/rpc/clnt_rc.c#1 branch .. //depot/projects/mips2/src/sys/rpc/clnt_stat.h#1 branch .. //depot/projects/mips2/src/sys/rpc/clnt_vc.c#1 branch .. //depot/projects/mips2/src/sys/rpc/getnetconfig.c#1 branch .. //depot/projects/mips2/src/sys/rpc/inet_ntop.c#1 branch .. //depot/projects/mips2/src/sys/rpc/inet_pton.c#1 branch .. //depot/projects/mips2/src/sys/rpc/netconfig.h#1 branch .. //depot/projects/mips2/src/sys/rpc/nettype.h#1 branch .. //depot/projects/mips2/src/sys/rpc/pmap_prot.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc_callmsg.c#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc_com.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc_generic.c#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc_msg.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpc_prot.c#1 branch .. //depot/projects/mips2/src/sys/rpc/rpcb_clnt.c#1 branch .. //depot/projects/mips2/src/sys/rpc/rpcb_clnt.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpcb_prot.c#1 branch .. //depot/projects/mips2/src/sys/rpc/rpcb_prot.h#1 branch .. //depot/projects/mips2/src/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/mips2/src/sys/rpc/svc.c#1 branch .. //depot/projects/mips2/src/sys/rpc/svc.h#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_auth.c#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_auth.h#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_auth_unix.c#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_dg.c#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_generic.c#1 branch .. //depot/projects/mips2/src/sys/rpc/svc_vc.c#1 branch .. //depot/projects/mips2/src/sys/rpc/types.h#2 integrate .. //depot/projects/mips2/src/sys/rpc/xdr.h#1 branch .. //depot/projects/mips2/src/sys/sparc64/include/bus.h#3 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/sun4v/include/cpu.h#2 integrate .. //depot/projects/mips2/src/sys/sys/buf.h#6 integrate .. //depot/projects/mips2/src/sys/sys/bufobj.h#5 integrate .. //depot/projects/mips2/src/sys/sys/cdefs.h#4 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/mips2/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/mips2/src/sys/sys/lockf.h#3 integrate .. //depot/projects/mips2/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/mips2/src/sys/sys/param.h#14 integrate .. //depot/projects/mips2/src/sys/sys/proc.h#15 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#10 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#10 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#10 integrate .. //depot/projects/mips2/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/mips2/src/sys/sys/vnode.h#7 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/xdr/xdr.c#1 branch .. //depot/projects/mips2/src/sys/xdr/xdr_array.c#1 branch .. //depot/projects/mips2/src/sys/xdr/xdr_mbuf.c#1 branch .. //depot/projects/mips2/src/sys/xdr/xdr_mem.c#1 branch .. //depot/projects/mips2/src/sys/xdr/xdr_reference.c#1 branch .. //depot/projects/mips2/src/sys/xdr/xdr_sizeof.c#1 branch .. //depot/projects/mips2/src/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate .. //depot/projects/mips2/src/tools/regression/bin/sh/builtins/getopts1.0#1 branch .. //depot/projects/mips2/src/tools/regression/bin/sh/builtins/getopts1.0.stdout#1 branch .. //depot/projects/mips2/src/tools/regression/file/flock/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/file/flock/flock.c#1 branch .. //depot/projects/mips2/src/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate .. //depot/projects/mips2/src/usr.bin/checknr/checknr.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/for.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/make.1#6 integrate .. //depot/projects/mips2/src/usr.bin/netstat/bpf.c#5 integrate .. //depot/projects/mips2/src/usr.bin/xlint/lint1/lint1.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#11 integrate .. //depot/projects/mips2/src/usr.sbin/arp/arp.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/clear_locks/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/clear_locks/clear_locks.8#1 branch .. //depot/projects/mips2/src/usr.sbin/clear_locks/clear_locks.c#1 branch .. //depot/projects/mips2/src/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#6 integrate .. //depot/projects/mips2/src/usr.sbin/rpc.lockd/rpc.lockd.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate .. //depot/projects/mips2/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate Differences ... ==== //depot/projects/mips2/src/Makefile#8 (text+ko) ==== @@ -1,6 +1,6 @@ #OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # -# $FreeBSD: src/Makefile,v 1.345 2008/01/30 19:33:18 jhb Exp $ +# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ # # The user-driven targets are: # @@ -175,6 +175,10 @@ .MAIN: all STARTTIME!= LC_ALL=C date +CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0 +.if !empty(CHECK_TIME) +.error check your date/time: ${STARTTIME} +.endif .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR) # ==== //depot/projects/mips2/src/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -1103,6 +1103,9 @@ OLD_FILES+=usr/sbin/ntptimeset OLD_FILES+=usr/share/man/man8/kernbb.8.gz OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz +# 20040627: usbdevs.h and usbdevs_data.h removal +OLD_FILES+=usr/include/dev/usb/usbdevs.h +OLD_FILES+=usr/include/dev/usb/usbdevs_data.h # 200406XX OLD_FILES+=usr/bin/gasp OLD_FILES+=usr/bin/gdbreplay @@ -3551,8 +3554,6 @@ OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/c++/3.4/ext/demangle.h OLD_FILES+=usr/include/cam/cam_extend.h -OLD_FILES+=usr/include/dev/usb/usbdevs.h -OLD_FILES+=usr/include/dev/usb/usbdevs_data.h OLD_FILES+=usr/include/dev/wi/wi_hostap.h OLD_FILES+=usr/include/disktab.h OLD_FILES+=usr/include/g++/FlexLexer.h ==== //depot/projects/mips2/src/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.26 2008/03/22 14:06:01 stefanf Exp $"); #include #include @@ -383,7 +383,7 @@ } ap2 = shellparam.p; while ((*ap2++ = *ap1++) != NULL); - shellparam.optnext = NULL; + shellparam.reset = 1; INTON; return 0; } @@ -405,6 +405,7 @@ if (*argptr != NULL) { setparam(argptr); } + shellparam.reset = 1; INTON; return 0; } @@ -414,7 +415,6 @@ getoptsreset(const char *value) { if (number(value) == 1) { - shellparam.optnext = NULL; shellparam.reset = 1; } } ==== //depot/projects/mips2/src/contrib/hostapd/ChangeLog#3 (text+ko) ==== @@ -1,5 +1,25 @@ ChangeLog for hostapd +2008-02-19 - v0.5.10 + * fixed EAP-SIM and EAP-AKA message parser to validate attribute + lengths properly to avoid potential crash caused by invalid messages + * fixed Reassociation Response callback processing when using internal + MLME (driver_{hostap,devicescape,test}.c) + * fixed EAP-SIM/AKA realm processing to allow decorated usernames to + be used + * added a workaround for EAP-SIM/AKA peers that include incorrect null + termination in the username + * fixed EAP-SIM Start response processing for fast reauthentication + case + * copy optional Proxy-State attributes into RADIUS response when acting + as a RADIUS authentication server + +2007-12-02 - v0.5.9 + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-07.txt) + * fixed debugging code not to use potentially unaligned read to fetch + IPv4 addresses + 2007-05-28 - v0.5.8 * updated driver_devicescape.c to build with the current wireless-dev.git tree and net/d80211 changes ==== //depot/projects/mips2/src/contrib/hostapd/Makefile#3 (text+ko) ==== @@ -313,6 +313,10 @@ CFLAGS += -DCONFIG_IPV6 endif +ifdef CONFIG_DRIVER_RADIUS_ACL +CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL +endif + ifdef CONFIG_FULL_DYNAMIC_VLAN # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges # and vlan interfaces for the vlan feature. ==== //depot/projects/mips2/src/contrib/hostapd/README#3 (text+ko) ==== @@ -2,7 +2,7 @@ Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2007, Jouni Malinen and contributors +Copyright (c) 2002-2008, Jouni Malinen and contributors All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD ==== //depot/projects/mips2/src/contrib/hostapd/aes_wrap.c#3 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -34,10 +34,11 @@ /** * aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) - * @kek: Key encryption key (KEK) - * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes - * @plain: Plaintext key to be wrapped, n * 64 bit - * @cipher: Wrapped key, (n + 1) * 64 bit + * @kek: 16-octet Key encryption key (KEK) + * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16 + * bytes + * @plain: Plaintext key to be wrapped, n * 64 bits + * @cipher: Wrapped key, (n + 1) * 64 bits * Returns: 0 on success, -1 on failure */ int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher) @@ -93,9 +94,10 @@ /** * aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394) * @kek: Key encryption key (KEK) - * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes - * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit - * @plain: Plaintext key, n * 64 bit + * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16 + * bytes + * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits + * @plain: Plaintext key, n * 64 bits * Returns: 0 on success, -1 on failure (e.g., integrity verification failed) */ int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain) @@ -167,28 +169,45 @@ /** - * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) + * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128 * @key: 128-bit key for the hash operation - * @data: Data buffer for which a MAC is determined - * @data: Length of data buffer in bytes + * @num_elem: Number of elements in the data vector + * @addr: Pointers to the data areas + * @len: Lengths of the data blocks * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) * Returns: 0 on success, -1 on failure */ -int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac) +int omac1_aes_128_vector(const u8 *key, size_t num_elem, + const u8 *addr[], const size_t *len, u8 *mac) { void *ctx; u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE]; - const u8 *pos = data; - size_t i, left = data_len; + const u8 *pos, *end; + size_t i, e, left, total_len; ctx = aes_encrypt_init(key, 16); if (ctx == NULL) return -1; os_memset(cbc, 0, BLOCK_SIZE); + total_len = 0; + for (e = 0; e < num_elem; e++) + total_len += len[e]; + left = total_len; + + e = 0; + pos = addr[0]; + end = pos + len[0]; + while (left >= BLOCK_SIZE) { - for (i = 0; i < BLOCK_SIZE; i++) + for (i = 0; i < BLOCK_SIZE; i++) { cbc[i] ^= *pos++; + if (pos >= end) { + e++; + pos = addr[e]; + end = pos + len[e]; + } + } if (left > BLOCK_SIZE) aes_encrypt(ctx, cbc, cbc); left -= BLOCK_SIZE; @@ -198,9 +217,15 @@ aes_encrypt(ctx, pad, pad); gf_mulx(pad); - if (left || data_len == 0) { - for (i = 0; i < left; i++) + if (left || total_len == 0) { + for (i = 0; i < left; i++) { cbc[i] ^= *pos++; + if (pos >= end) { + e++; + pos = addr[e]; + end = pos + len[e]; + } + } cbc[left] ^= 0x80; gf_mulx(pad); } @@ -212,6 +237,24 @@ return 0; } + +/** + * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC) + * @key: 128-bit key for the hash operation + * @data: Data buffer for which a MAC is determined + * @data_len: Length of data buffer in bytes + * @mac: Buffer for MAC (128 bits, i.e., 16 bytes) + * Returns: 0 on success, -1 on failure + * + * This is a mode for using block cipher (AES in this case) for authentication. + * OMAC1 was standardized with the name CMAC by NIST in a Special Publication + * (SP) 800-38B. + */ +int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac) +{ + return omac1_aes_128_vector(key, 1, &data, &data_len, mac); +} + #endif /* CONFIG_NO_AES_OMAC1 */ ==== //depot/projects/mips2/src/contrib/hostapd/aes_wrap.h#3 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -24,6 +24,8 @@ int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher); int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain); +int omac1_aes_128_vector(const u8 *key, size_t num_elem, + const u8 *addr[], const size_t *len, u8 *mac); int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac); int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out); int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce, ==== //depot/projects/mips2/src/contrib/hostapd/common.c#3 (text+ko) ==== @@ -20,7 +20,6 @@ #ifdef CONFIG_DEBUG_FILE static FILE *out_file = NULL; #endif /* CONFIG_DEBUG_FILE */ -int wpa_debug_use_file = 0; int wpa_debug_level = MSG_INFO; int wpa_debug_show_keys = 0; int wpa_debug_timestamp = 0; @@ -344,32 +343,29 @@ } -int wpa_debug_open_file(void) +int wpa_debug_open_file(const char *path) { #ifdef CONFIG_DEBUG_FILE - static int count = 0; - char fname[64]; - if (!wpa_debug_use_file) + if (!path) return 0; -#ifdef _WIN32 - os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt", - count++); -#else /* _WIN32 */ - os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt", - count++); + out_file = fopen(path, "a"); + if (out_file == NULL) { + wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open " + "output file, using standard output"); + return -1; + } +#ifndef _WIN32 + setvbuf(out_file, NULL, _IOLBF, 0); #endif /* _WIN32 */ - out_file = fopen(fname, "w"); - return out_file == NULL ? -1 : 0; -#else /* CONFIG_DEBUG_FILE */ +#endif /* CONFIG_DEBUG_FILE */ return 0; -#endif /* CONFIG_DEBUG_FILE */ } void wpa_debug_close_file(void) { #ifdef CONFIG_DEBUG_FILE - if (!wpa_debug_use_file) + if (!out_file) return; fclose(out_file); out_file = NULL; ==== //depot/projects/mips2/src/contrib/hostapd/common.h#3 (text+ko) ==== @@ -264,12 +264,12 @@ #define wpa_hexdump_key(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0) -#define wpa_debug_open_file() do { } while (0) +#define wpa_debug_open_file(p) do { } while (0) #define wpa_debug_close_file() do { } while (0) #else /* CONFIG_NO_STDOUT_DEBUG */ -int wpa_debug_open_file(void); +int wpa_debug_open_file(const char *path); void wpa_debug_close_file(void); /** ==== //depot/projects/mips2/src/contrib/hostapd/defconfig#3 (text+ko) ==== @@ -102,3 +102,7 @@ # Build IPv6 support for RADIUS operations CONFIG_IPV6=y + +# Use the hostapd's IEEE 802.11 authentication (ACL), but without +# the IEEE 802.11 Management capability +CONFIG_DRIVER_RADIUS_ACL=y ==== //depot/projects/mips2/src/contrib/hostapd/driver.h#3 (text+ko) ==== @@ -141,6 +141,10 @@ * this handler will be called after initial setup has been completed. */ int (*commit)(void *priv); + + int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, + u32 session_timeout); + int (*set_radius_acl_expire)(void *priv, const u8 *mac); }; static inline int @@ -653,4 +657,22 @@ return hapd->driver->commit(hapd->driver); } +static inline int +hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, + u32 session_timeout) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL) + return 0; + return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted, + session_timeout); +} + +static inline int +hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL) + return 0; + return hapd->driver->set_radius_acl_expire(hapd->driver, mac); +} + #endif /* DRIVER_H */ ==== //depot/projects/mips2/src/contrib/hostapd/driver_test.c#3 (text+ko) ==== @@ -170,9 +170,10 @@ u16 fc; if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) { - wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d " - "socket_dir=%p)", - __func__, drv->test_socket, len, drv->socket_dir); + wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu" + " socket_dir=%p)", + __func__, drv->test_socket, (unsigned long) len, + drv->socket_dir); return -1; } ==== //depot/projects/mips2/src/contrib/hostapd/eap_aka.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * hostapd / EAP-AKA (RFC 4187) - * Copyright (c) 2005-2007, Jouni Malinen + * Copyright (c) 2005-2008, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -124,6 +124,14 @@ sm->identity_len)) { wpa_printf(MSG_DEBUG, " AT_PERMANENT_ID_REQ"); eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0); + } else { + /* + * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is + * ignored and the AKA/Identity is used to request the + * identity. + */ + wpa_printf(MSG_DEBUG, " AT_ANY_ID_REQ"); + eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0); } return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0); } @@ -445,10 +453,16 @@ sm->method_pending = METHOD_PENDING_NONE; } + identity_len = sm->identity_len; + while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') { + wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null " + "character from identity"); + identity_len--; + } wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation", - sm->identity, sm->identity_len); + sm->identity, identity_len); - eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck, + eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck, data->mk); eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk, data->emsk); ==== //depot/projects/mips2/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server + * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server * Copyright (c) 2006-2007, Jouni Malinen * * This program is free software; you can redistribute it and/or modify @@ -23,15 +23,15 @@ struct eap_gpsk_data { enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state; u8 rand_server[EAP_GPSK_RAND_LEN]; - u8 rand_client[EAP_GPSK_RAND_LEN]; + u8 rand_peer[EAP_GPSK_RAND_LEN]; u8 msk[EAP_MSK_LEN]; u8 emsk[EAP_EMSK_LEN]; u8 sk[EAP_GPSK_MAX_SK_LEN]; size_t sk_len; u8 pk[EAP_GPSK_MAX_PK_LEN]; size_t pk_len; - u8 *id_client; - size_t id_client_len; + u8 *id_peer; + size_t id_peer_len; u8 *id_server; size_t id_server_len; #define MAX_NUM_CSUITES 2 @@ -85,17 +85,17 @@ data->csuite_count = 0; if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF, EAP_GPSK_CIPHER_AES)) { - WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor, + WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor, EAP_GPSK_VENDOR_IETF); - WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier, + WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier, EAP_GPSK_CIPHER_AES); data->csuite_count++; } if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF, EAP_GPSK_CIPHER_SHA256)) { - WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor, + WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor, EAP_GPSK_VENDOR_IETF); - WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier, + WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier, EAP_GPSK_CIPHER_SHA256); data->csuite_count++; } @@ -108,7 +108,7 @@ { struct eap_gpsk_data *data = priv; free(data->id_server); - free(data->id_client); + free(data->id_peer); free(data); } @@ -174,8 +174,8 @@ wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3"); miclen = eap_gpsk_mic_len(data->vendor, data->specifier); - len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 + - miclen; + len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len + + sizeof(struct eap_gpsk_csuite) + 2 + miclen; req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen, len, EAP_CODE_REQUEST, id, &pos); if (req == NULL) { @@ -188,13 +188,18 @@ *pos++ = EAP_GPSK_OPCODE_GPSK_3; start = pos; - memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN); + memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN); pos += EAP_GPSK_RAND_LEN; memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN); pos += EAP_GPSK_RAND_LEN; + WPA_PUT_BE16(pos, data->id_server_len); >>> TRUNCATED FOR MAIL (1000 lines) <<<