Date: Tue, 10 Jul 2007 13:10:10 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 123273 for review Message-ID: <200707101310.l6ADAAL0073608@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=123273 Change 123273 by peter@peter_overcee on 2007/07/10 13:09:38 IFC @123271 Affected files ... .. //depot/projects/hammer/Makefile.inc1#125 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#31 integrate .. //depot/projects/hammer/UPDATING#105 integrate .. //depot/projects/hammer/bin/sh/var.c#14 integrate .. //depot/projects/hammer/contrib/hostapd/COPYING#2 integrate .. //depot/projects/hammer/contrib/hostapd/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/hostapd/Makefile#4 integrate .. //depot/projects/hammer/contrib/hostapd/README#3 integrate .. //depot/projects/hammer/contrib/hostapd/accounting.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/aes.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/aes.h#1 branch .. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/ap.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/hammer/contrib/hostapd/beacon.c#1 branch .. //depot/projects/hammer/contrib/hostapd/beacon.h#1 branch .. //depot/projects/hammer/contrib/hostapd/build_config.h#1 branch .. //depot/projects/hammer/contrib/hostapd/common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/common.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/config.c#5 integrate .. //depot/projects/hammer/contrib/hostapd/config.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/crypto.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/crypto.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/defconfig#3 integrate .. //depot/projects/hammer/contrib/hostapd/defs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/des.c#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/driver.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/driver_test.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/driver_wired.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_defs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_i.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_identity.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_md5.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_peap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_ttls.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_ttls.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eloop.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/hammer/contrib/hostapd/hostap_common.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.eap_user#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/hammer/contrib/hostapd/iapp.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/includes.h#1 branch .. //depot/projects/hammer/contrib/hostapd/l2_packet.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/md4.c#1 branch .. //depot/projects/hammer/contrib/hostapd/md5.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/md5.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/milenage.c#1 branch .. //depot/projects/hammer/contrib/hostapd/milenage.h#1 branch .. //depot/projects/hammer/contrib/hostapd/mlme.c#1 branch .. //depot/projects/hammer/contrib/hostapd/mlme.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ms_funcs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/os.h#1 branch .. //depot/projects/hammer/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/hammer/contrib/hostapd/os_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/hammer/contrib/hostapd/preauth.c#1 branch .. //depot/projects/hammer/contrib/hostapd/preauth.h#1 branch .. //depot/projects/hammer/contrib/hostapd/radius.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius_client.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/radius_client.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius_server.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/radius_server.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/rc4.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/rc4.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sha1.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/sha1.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/sha256.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sha256.h#1 branch .. //depot/projects/hammer/contrib/hostapd/sta_info.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/sta_info.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/hammer/contrib/hostapd/tls.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/hammer/contrib/hostapd/tls_none.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/version.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/hammer/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wme.c#1 branch .. //depot/projects/hammer/contrib/hostapd/wme.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/wpa.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/hammer/etc/inetd.conf#11 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#46 integrate .. //depot/projects/hammer/include/Makefile#68 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#43 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#14 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/hammer/lib/libc/arm/SYS.h#6 integrate .. //depot/projects/hammer/lib/libc/gen/__getosreldate.c#5 integrate .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_status.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#44 integrate .. //depot/projects/hammer/sbin/ifconfig/iflagg.c#3 integrate .. //depot/projects/hammer/sbin/ping6/Makefile#7 integrate .. //depot/projects/hammer/share/examples/isdn/FAQ#3 integrate .. //depot/projects/hammer/share/examples/isdn/Overview#3 integrate .. //depot/projects/hammer/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/hammer/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/hammer/share/examples/isdn/i4brunppp/i4brunppp.c#3 integrate .. //depot/projects/hammer/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#14 integrate .. //depot/projects/hammer/sys/Makefile#17 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#15 integrate .. //depot/projects/hammer/sys/conf/NOTES#122 integrate .. //depot/projects/hammer/sys/conf/files#155 integrate .. //depot/projects/hammer/sys/conf/files.amd64#93 integrate .. //depot/projects/hammer/sys/conf/files.i386#79 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#47 integrate .. //depot/projects/hammer/sys/conf/options#110 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#38 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#19 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#27 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/hammer/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#11 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#48 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#23 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#19 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_ruereg.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#46 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#82 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#19 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#59 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#10 integrate .. //depot/projects/hammer/sys/i386/include/i4b_cause.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_debug.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_ioctl.h#5 delete .. //depot/projects/hammer/sys/i386/include/i4b_rbch_ioctl.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_tel_ioctl.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_trace.h#3 delete .. //depot/projects/hammer/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_l4if.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_llif.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_msgs.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_card.c#6 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_isa.c#8 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_lli.c#7 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ctl.c#8 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ing.c#12 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#20 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#16 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_rbch.c#11 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_tel.c#11 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_trace.c#12 integrate .. //depot/projects/hammer/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_l1l2.h#3 integrate .. //depot/projects/hammer/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1dmux.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1lib.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_ctx_s0P.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_diva.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_drn_ngo.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_dynalink.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_hscx.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_isa.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_siemens_isurf.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_sws.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_usr_sti.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_isac.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_l1.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#16 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_iframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2fsm.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2timer.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_lme.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_sframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_tei.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_uframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_util.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l3fsm.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l3timer.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l4if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_q931.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_q932fac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_i4bdrv.c#12 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4mgmt.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4timer.c#5 integrate .. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#7 integrate .. //depot/projects/hammer/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#16 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#7 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#4 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#4 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#75 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#67 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#44 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#49 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#7 integrate .. //depot/projects/hammer/sys/netinet6/dest6.c#5 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#11 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#27 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#18 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#31 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#19 integrate .. //depot/projects/hammer/sys/netinet6/ip6_id.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#32 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#21 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#44 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#19 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#32 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#23 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#31 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#8 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#18 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#28 integrate .. //depot/projects/hammer/sys/netinet6/udp6_var.h#4 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#16 integrate .. //depot/projects/hammer/sys/opencrypto/cast.c#4 integrate .. //depot/projects/hammer/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/hammer/sys/pci/if_rlreg.h#26 integrate .. //depot/projects/hammer/sys/powerpc/include/atomic.h#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#25 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#6 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/param.h#91 integrate .. //depot/projects/hammer/sys/sys/sx.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#46 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.icase3.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#9 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#20 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#8 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/i4b/g711conv/g711conv.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/isdnd.8#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/isdnd.h#5 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdndebug/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdndecode/decode.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnphone/defs.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntel/defs.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntelctl/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntest/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntrace/trace.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/man/i4b.4#3 integrate .. //depot/projects/hammer/usr.sbin/inetd/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/ppp/i4b.c#3 integrate .. //depot/projects/hammer/usr.sbin/rrenumd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/driver_freebsd.c#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/l2_packet.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#125 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -979,6 +979,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/hammer/ObsoleteFiles.inc#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.103 2007/07/04 16:21:27 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070705: I4B headers repo-copied to include/i4b/ +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/i4b_cause.h +OLD_FILES+=usr/include/machine/i4b_debug.h +OLD_FILES+=usr/include/machine/i4b_ioctl.h +OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h +OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h +OLD_FILES+=usr/include/machine/i4b_trace.h +.endif # 20070704: I4B 'modules' temporary disconnected .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/share/man/man4/i4bing.4.gz ==== //depot/projects/hammer/UPDATING#105 (text+ko) ==== @@ -47,6 +47,11 @@ information. 20070612: + The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver + instead of the nve(4) driver. Please update your configuration + accordingly. + +20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If desired, set the new rc.conf option sendmail_rebuild_aliases @@ -882,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.501 2007/07/04 21:47:23 gnn Exp $ +$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ ==== //depot/projects/hammer/bin/sh/var.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $"); #include <unistd.h> #include <stdlib.h> @@ -278,6 +278,30 @@ return 0; } + +/* + * Sets/unsets an environment variable from a pointer that may actually be a + * pointer into environ where the string should not be manipulated. + */ +static void +change_env(char *s, int set) +{ + char *eqp; + char *ss; + + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + if (set && eqp != NULL) + (void) setenv(ss, eqp + 1, 1); + else + (void) unsetenv(ss); + ckfree(ss); + + return; +} + + /* * Same as setvar except that the variable and value are passed in * the first argument as name=value. Since the first argument will @@ -289,7 +313,6 @@ setvareq(char *s, int flags) { struct var *vp, **vpp; - char *p; int len; if (aflag) @@ -320,10 +343,7 @@ if (vp == &vmpath || (vp == &vmail && ! mpathset())) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -339,10 +359,7 @@ INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -603,10 +620,7 @@ vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - p = strchr(vp->text, '='); - *p = '\0'; - (void) setenv(vp->text, p + 1, 1); - *p = '='; + change_env(vp->text, 1); (void) setlocale(LC_ALL, ""); } goto found; @@ -798,7 +812,7 @@ if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + change_env(s, 0); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; ==== //depot/projects/hammer/contrib/hostapd/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/hammer/contrib/hostapd/ChangeLog#4 (text+ko) ==== @@ -1,9 +1,136 @@ ChangeLog for hostapd -2006-02-08 - v0.4.8 +2007-05-28 - v0.5.8 + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PSK bit ordering of the Flags field + * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs + by reading wpa_psk_file [Bug 181] + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * fixed IPv6 connection to RADIUS accounting server + +2006-11-24 - v0.5.6 + * added support for configuring and controlling multiple BSSes per + radio interface (bss=<ifname> in hostapd.conf); this is only + available with Devicescape and test driver interfaces + * fixed PMKSA cache update in the end of successful RSN + pre-authentication + * added support for dynamic VLAN configuration (i.e., selecting VLAN-ID + for each STA based on RADIUS Access-Accept attributes); this requires + VLAN support from the kernel driver/802.11 stack and this is + currently only available with Devicescape and test driver interfaces + * driver_madwifi: fixed configuration of unencrypted modes (plaintext + and IEEE 802.1X without WEP) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM) + * hlr_auc_gw: added support for reading per-IMSI Milenage keys and + parameters from a text file to make it possible to implement proper + GSM/UMTS authentication server for multiple SIM/USIM cards using + EAP-SIM/EAP-AKA + * fixed session timeout processing with drivers that do not use + ieee802_11.c (e.g., madwifi) + +2006-08-27 - v0.5.5 + * added 'hostapd_cli new_sta <addr>' command for adding a new STA into + hostapd (e.g., to initialize wired network authentication based on an + external signal) + * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when + using WPA2 even if PMKSA caching is not used + * added -P<pid file> argument for hostapd to write the current process + id into a file + * added support for RADIUS Authentication Server MIB (RFC 2619) + +2006-06-20 - v0.5.4 + * fixed nt_password_hash build [Bug 144] + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * fixed a segmentation fault when RSN pre-authentication was completed + successfully [Bug 152] + +2006-04-27 - v0.5.3 + * do not build nt_password_hash and hlr_auc_gw by default to avoid + requiring a TLS library for a successful build; these programs can be + build with 'make nt_password_hash' and 'make hlr_auc_gw' + * added a new configuration option, eapol_version, that can be used to + set EAPOL version to 1 (default is 2) to work around broken client + implementations that drop EAPOL frames which use version number 2 + [Bug 89] + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * fixed EAP-MSCHAPv2 message length validation + +2006-03-19 - v0.5.2 * fixed stdarg use in hostapd_logger(): if both stdout and syslog logging was enabled, hostapd could trigger a segmentation fault in vsyslog on some CPU -- C library combinations + * moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external + program to make it easier to use for implementing real SS7 gateway; + eap_sim_db is not anymore used as a file name for GSM authentication + triplets; instead, it is path to UNIX domain socket that will be used + to communicate with the external gateway program (e.g., hlr_auc_gw) + * added example HLR/AuC gateway implementation, hlr_auc_gw, that uses + local information (GSM authentication triplets from a text file and + hardcoded AKA authentication data); this can be used to test EAP-SIM + and EAP-AKA + * added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw + to make it possible to test EAP-AKA with real USIM cards (this is + disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw + to enable this) + * driver_madwifi: added support for getting station RSN IE from + madwifi-ng svn r1453 and newer; this fixes RSN that was apparently + broken with earlier change (r1357) in the driver + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE) + [Bug 125] + * added ap_max_inactivity configuration parameter + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (test_socket=DIR:/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * added support for EAP methods to use callbacks to external programs + by buffering a pending request and processing it after the EAP method + is ready to continue + * improved EAP-SIM database interface to allow external request to GSM + HLR/AuC without blocking hostapd process + * added support for using EAP-SIM pseudonyms and fast re-authentication + * added support for EAP-AKA in the integrated EAP authenticator + * added support for matching EAP identity prefixes (e.g., "1"*) in EAP + user database to allow EAP-SIM/AKA selection without extra roundtrip + for EAP-Nak negotiation + * added support for storing EAP user password as NtPasswordHash instead + of plaintext password when using MSCHAP or MSCHAPv2 for + authentication (hash:<16-octet hex value>); added nt_password_hash + tool for hashing password to generate NtPasswordHash 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * driver_wired: fixed EAPOL sending to optionally use PAE group address ==== //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,12 +1,17 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $ .cvsignore driver.c driver_bsd.c +driver_devicescape.c driver_madwifi.c driver_prism54.c l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c l2_packet_pcap.c +l2_packet_winpcap.c +nt_password_hash.c +os_win32.c prism54.h priv_netlink.h wireless_copy.h ==== //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $ WPA/802.1x Authenticator originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.4.8' \ - src/contrib/hostapd MALINEN v0_4_8 + cvs import -m 'Import of hostapd 0.5.8' \ + src/contrib/hostapd MALINEN v0_5_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -6-March-2006 +7-July-2007 ==== //depot/projects/hammer/contrib/hostapd/Makefile#4 (text+ko) ==== @@ -1,6 +1,5 @@ CC=gcc DIR_WPA_SUPPLICANT=. -DIR_HOSTAP=. ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g @@ -11,18 +10,41 @@ CFLAGS += -DHOSTAPD_DUMP_STATE # Include directories for CVS version -CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT) +CFLAGS += -I. -I../utils -I$(DIR_WPA_SUPPLICANT) # Uncomment following line and set the path to your kernel tree include # directory if your C library does not include all header files. # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o \ +-include .config + +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +ifdef CONFIG_NATIVE_WINDOWS +CFLAGS += -DCONFIG_NATIVE_WINDOWS +LIBS += -lws2_32 +endif + +OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o md4.o \ common.o ieee802_11.o config.o ieee802_11_auth.o accounting.o \ sta_info.o radius_client.o sha1.o wpa.o aes_wrap.o ctrl_iface.o \ - driver_conf.o + driver_conf.o os_$(CONFIG_OS).o preauth.o pmksa_cache.o beacon.o \ + hw_features.o wme.o ap_list.o reconfig.o \ + mlme.o vlan_init.o ieee802_11h.o + +HOBJS=hlr_auc_gw.o common.o os_$(CONFIG_OS).o milenage.o aes_wrap.o --include .config +CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX ifdef CONFIG_IAPP CFLAGS += -DCONFIG_IAPP @@ -34,6 +56,15 @@ CONFIG_L2_PACKET=y endif +ifdef CONFIG_PEERKEY +CFLAGS += -DCONFIG_PEERKEY +endif + +ifdef CONFIG_IEEE80211W +CFLAGS += -DCONFIG_IEEE80211W +NEED_SHA256=y +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS += driver.o @@ -55,6 +86,11 @@ OBJS += driver_prism54.o endif +ifdef CONFIG_DRIVER_DEVICESCAPE +CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE +OBJS += driver_devicescape.o +endif + ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS += driver_bsd.o @@ -70,7 +106,6 @@ ifdef CONFIG_L2_PACKET ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP ifdef CONFIG_L2_FREEBSD LIBS += -lpcap OBJS += $(DIR_WPA_SUPPLICANT)/l2_packet_freebsd.o @@ -122,9 +157,21 @@ ifdef CONFIG_EAP_SIM CFLAGS += -DEAP_SIM -OBJS += eap_sim.o $(DIR_WPA_SUPPLICANT)/eap_sim_common.o -# Example EAP-SIM interface for GSM authentication. This can be replaced with -# another file implementating the interface specified in eap_sim_db.h. +OBJS += eap_sim.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_AKA +CFLAGS += -DEAP_AKA +OBJS += eap_aka.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_SIM_COMMON +OBJS += $(DIR_WPA_SUPPLICANT)/eap_sim_common.o +# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be +# replaced with another file implementating the interface specified in +# eap_sim_db.h. OBJS += eap_sim_db.o endif @@ -138,6 +185,25 @@ OBJS += eap_psk.o $(DIR_WPA_SUPPLICANT)/eap_psk_common.o endif +ifdef CONFIG_EAP_SAKE +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o $(DIR_WPA_SUPPLICANT)/eap_sake_common.o +endif + +ifdef CONFIG_EAP_GPSK +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o $(DIR_WPA_SUPPLICANT)/eap_gpsk_common.o +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif +endif + +ifdef CONFIG_EAP_VENDOR_TEST +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif + ifdef CONFIG_EAP_TLV CFLAGS += -DEAP_TLV OBJS += eap_tlv.o @@ -145,15 +211,34 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER -OBJS += eap.o eap_identity.o +OBJS += eap.o eap_methods.o eap_identity.o +endif + +ifndef CONFIG_TLS +CONFIG_TLS=openssl endif ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) CFLAGS += -DEAP_TLS_FUNCS -OBJS += eap_tls_common.o $(DIR_WPA_SUPPLICANT)/tls_openssl.o +OBJS += eap_tls_common.o +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_gnutls.o +LIBS += -lgnutls -lgcrypt -lgpg-error +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif +NEED_CRYPTO=y else OBJS += $(DIR_WPA_SUPPLICANT)/tls_none.o endif @@ -163,10 +248,60 @@ endif >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707101310.l6ADAAL0073608>