Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/wpa/dist Import wpa_supplicant and hostapd



details:   https://anonhg.NetBSD.org/src/rev/85dfd2e3d230
branches:  trunk
changeset: 333056:85dfd2e3d230
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 16 19:16:01 2014 +0000

description:
Import wpa_supplicant and hostapd

diffstat:

 external/bsd/wpa/dist/CONTRIBUTIONS                                                |   143 +
 external/bsd/wpa/dist/README                                                       |     2 +-
 external/bsd/wpa/dist/hostapd/Android.mk                                           |   133 +-
 external/bsd/wpa/dist/hostapd/ChangeLog                                            |   142 +
 external/bsd/wpa/dist/hostapd/Makefile                                             |   100 +-
 external/bsd/wpa/dist/hostapd/README                                               |     2 +-
 external/bsd/wpa/dist/hostapd/README-WPS                                           |    15 +-
 external/bsd/wpa/dist/hostapd/android.config                                       |     6 +-
 external/bsd/wpa/dist/hostapd/config_file.c                                        |  3098 ++--
 external/bsd/wpa/dist/hostapd/ctrl_iface.c                                         |   875 +-
 external/bsd/wpa/dist/hostapd/defconfig                                            |    70 +-
 external/bsd/wpa/dist/hostapd/eap_register.c                                       |    12 +
 external/bsd/wpa/dist/hostapd/hapd_module_tests.c                                  |    17 +
 external/bsd/wpa/dist/hostapd/hlr_auc_gw.c                                         |   252 +-
 external/bsd/wpa/dist/hostapd/hostapd.conf                                         |   230 +-
 external/bsd/wpa/dist/hostapd/hostapd.eap_user                                     |     6 +
 external/bsd/wpa/dist/hostapd/hostapd.eap_user_sqlite                              |     9 +
 external/bsd/wpa/dist/hostapd/main.c                                               |   291 +-
 external/bsd/wpa/dist/hostapd/wps-ap-nfc.py                                        |   342 +
 external/bsd/wpa/dist/hs20/client/Android.mk                                       |    77 +
 external/bsd/wpa/dist/hs20/client/Makefile                                         |    94 +
 external/bsd/wpa/dist/hs20/client/devdetail.xml                                    |    47 +
 external/bsd/wpa/dist/hs20/client/devinfo.xml                                      |     7 +
 external/bsd/wpa/dist/hs20/client/est.c                                            |   715 +
 external/bsd/wpa/dist/hs20/client/oma_dm_client.c                                  |  1370 ++
 external/bsd/wpa/dist/hs20/client/osu_client.c                                     |  3203 ++++
 external/bsd/wpa/dist/hs20/client/osu_client.h                                     |   118 +
 external/bsd/wpa/dist/hs20/client/spp_client.c                                     |   995 +
 external/bsd/wpa/dist/patches/openssl-0.9.8za-tls-extensions.patch                 |   396 +
 external/bsd/wpa/dist/src/Makefile                                                 |     2 +-
 external/bsd/wpa/dist/src/ap/Makefile                                              |     2 +-
 external/bsd/wpa/dist/src/ap/accounting.c                                          |    49 +-
 external/bsd/wpa/dist/src/ap/acs.c                                                 |   829 +
 external/bsd/wpa/dist/src/ap/acs.h                                                 |    27 +
 external/bsd/wpa/dist/src/ap/ap_config.c                                           |   381 +-
 external/bsd/wpa/dist/src/ap/ap_config.h                                           |   108 +-
 external/bsd/wpa/dist/src/ap/ap_drv_ops.c                                          |   202 +-
 external/bsd/wpa/dist/src/ap/ap_drv_ops.h                                          |    90 +-
 external/bsd/wpa/dist/src/ap/ap_list.c                                             |   101 +-
 external/bsd/wpa/dist/src/ap/ap_list.h                                             |    22 +-
 external/bsd/wpa/dist/src/ap/ap_mlme.c                                             |     6 +-
 external/bsd/wpa/dist/src/ap/authsrv.c                                             |    14 +-
 external/bsd/wpa/dist/src/ap/beacon.c                                              |   396 +-
 external/bsd/wpa/dist/src/ap/beacon.h                                              |    19 +-
 external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c                                       |   314 +-
 external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h                                       |     7 +-
 external/bsd/wpa/dist/src/ap/dfs.c                                                 |   985 +
 external/bsd/wpa/dist/src/ap/dfs.h                                                 |    26 +
 external/bsd/wpa/dist/src/ap/drv_callbacks.c                                       |   461 +-
 external/bsd/wpa/dist/src/ap/eap_user_db.c                                         |    16 +-
 external/bsd/wpa/dist/src/ap/gas_serv.c                                            |   470 +-
 external/bsd/wpa/dist/src/ap/gas_serv.h                                            |    19 +-
 external/bsd/wpa/dist/src/ap/hostapd.c                                             |  1431 +-
 external/bsd/wpa/dist/src/ap/hostapd.h                                             |   134 +-
 external/bsd/wpa/dist/src/ap/hs20.c                                                |   154 +-
 external/bsd/wpa/dist/src/ap/hs20.h                                                |     8 +-
 external/bsd/wpa/dist/src/ap/hw_features.c                                         |   585 +-
 external/bsd/wpa/dist/src/ap/hw_features.h                                         |    16 +-
 external/bsd/wpa/dist/src/ap/iapp.c                                                |    82 +-
 external/bsd/wpa/dist/src/ap/ieee802_11.c                                          |   630 +-
 external/bsd/wpa/dist/src/ap/ieee802_11.h                                          |    17 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_auth.c                                     |    38 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_ht.c                                       |   253 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_shared.c                                   |   134 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_vht.c                                      |    82 +-
 external/bsd/wpa/dist/src/ap/ieee802_1x.c                                          |   542 +-
 external/bsd/wpa/dist/src/ap/p2p_hostapd.c                                         |     5 +-
 external/bsd/wpa/dist/src/ap/peerkey_auth.c                                        |     4 +-
 external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c                                    |    81 +-
 external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h                                    |     2 +
 external/bsd/wpa/dist/src/ap/sta_info.c                                            |   243 +-
 external/bsd/wpa/dist/src/ap/sta_info.h                                            |    41 +-
 external/bsd/wpa/dist/src/ap/tkip_countermeasures.c                                |     8 +-
 external/bsd/wpa/dist/src/ap/vlan_init.c                                           |    57 +-
 external/bsd/wpa/dist/src/ap/vlan_init.h                                           |    10 +-
 external/bsd/wpa/dist/src/ap/wmm.c                                                 |    12 +-
 external/bsd/wpa/dist/src/ap/wmm.h                                                 |    10 +-
 external/bsd/wpa/dist/src/ap/wnm_ap.c                                              |   268 +-
 external/bsd/wpa/dist/src/ap/wnm_ap.h                                              |    11 +-
 external/bsd/wpa/dist/src/ap/wpa_auth.h                                            |    31 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_ft.c                                         |   261 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_glue.c                                       |    49 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_i.h                                          |    23 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_ie.c                                         |   141 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_ie.h                                         |     7 +
 external/bsd/wpa/dist/src/ap/wps_hostapd.c                                         |   503 +-
 external/bsd/wpa/dist/src/ap/wps_hostapd.h                                         |     9 +
 external/bsd/wpa/dist/src/common/Makefile                                          |     2 +-
 external/bsd/wpa/dist/src/common/common_module_tests.c                             |   172 +
 external/bsd/wpa/dist/src/common/defs.h                                            |    62 +-
 external/bsd/wpa/dist/src/common/eapol_common.h                                    |    13 +-
 external/bsd/wpa/dist/src/common/ieee802_11_common.c                               |   151 +-
 external/bsd/wpa/dist/src/common/ieee802_11_common.h                               |    19 +-
 external/bsd/wpa/dist/src/common/ieee802_11_defs.h                                 |   287 +-
 external/bsd/wpa/dist/src/common/ieee802_1x_defs.h                                 |    78 +
 external/bsd/wpa/dist/src/common/qca-vendor-attr.h                                 |    28 +
 external/bsd/wpa/dist/src/common/qca-vendor.h                                      |    92 +
 external/bsd/wpa/dist/src/common/sae.c                                             |  1064 +
 external/bsd/wpa/dist/src/common/sae.h                                             |    64 +
 external/bsd/wpa/dist/src/common/tnc.h                                             |   121 +
 external/bsd/wpa/dist/src/common/version.h                                         |     2 +-
 external/bsd/wpa/dist/src/common/wpa_common.c                                      |   344 +-
 external/bsd/wpa/dist/src/common/wpa_common.h                                      |    37 +-
 external/bsd/wpa/dist/src/common/wpa_ctrl.c                                        |   124 +-
 external/bsd/wpa/dist/src/common/wpa_ctrl.h                                        |    98 +-
 external/bsd/wpa/dist/src/common/wpa_helpers.c                                     |   292 +
 external/bsd/wpa/dist/src/common/wpa_helpers.h                                     |    37 +
 external/bsd/wpa/dist/src/crypto/Makefile                                          |     3 +-
 external/bsd/wpa/dist/src/crypto/aes-ccm.c                                         |     2 +-
 external/bsd/wpa/dist/src/crypto/aes-gcm.c                                         |     2 +-
 external/bsd/wpa/dist/src/crypto/aes-unwrap.c                                      |    19 +-
 external/bsd/wpa/dist/src/crypto/aes-wrap.c                                        |    20 +-
 external/bsd/wpa/dist/src/crypto/aes_wrap.h                                        |     8 +-
 external/bsd/wpa/dist/src/crypto/crypto.h                                          |   323 +-
 external/bsd/wpa/dist/src/crypto/crypto_internal-rsa.c                             |     9 +
 external/bsd/wpa/dist/src/crypto/crypto_openssl.c                                  |   433 +-
 external/bsd/wpa/dist/src/crypto/dh_groups.c                                       |   666 +-
 external/bsd/wpa/dist/src/crypto/dh_groups.h                                       |     3 +
 external/bsd/wpa/dist/src/crypto/milenage.c                                        |     4 +-
 external/bsd/wpa/dist/src/crypto/ms_funcs.c                                        |     1 +
 external/bsd/wpa/dist/src/crypto/sha1-internal.c                                   |     2 +
 external/bsd/wpa/dist/src/crypto/sha256-prf.c                                      |    38 +-
 external/bsd/wpa/dist/src/crypto/sha256.h                                          |     5 +-
 external/bsd/wpa/dist/src/crypto/tls.h                                             |    30 +-
 external/bsd/wpa/dist/src/crypto/tls_gnutls.c                                      |     2 -
 external/bsd/wpa/dist/src/crypto/tls_internal.c                                    |    24 +
 external/bsd/wpa/dist/src/crypto/tls_openssl.c                                     |   677 +-
 external/bsd/wpa/dist/src/drivers/Makefile                                         |     2 +-
 external/bsd/wpa/dist/src/drivers/android_drv.h                                    |     8 +-
 external/bsd/wpa/dist/src/drivers/driver.h                                         |  1300 +-
 external/bsd/wpa/dist/src/drivers/driver_atheros.c                                 |   155 +-
 external/bsd/wpa/dist/src/drivers/driver_common.c                                  |    37 +-
 external/bsd/wpa/dist/src/drivers/driver_macsec_qca.c                              |   887 +
 external/bsd/wpa/dist/src/drivers/driver_madwifi.c                                 |    20 +-
 external/bsd/wpa/dist/src/drivers/driver_ndis.c                                    |    42 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211.c                                 |  6525 +++++++--
 external/bsd/wpa/dist/src/drivers/driver_openbsd.c                                 |   136 +
 external/bsd/wpa/dist/src/drivers/driver_roboswitch.c                              |    20 +-
 external/bsd/wpa/dist/src/drivers/driver_wext.c                                    |   196 +-
 external/bsd/wpa/dist/src/drivers/driver_wext.h                                    |     6 -
 external/bsd/wpa/dist/src/drivers/driver_wired.c                                   |    39 +
 external/bsd/wpa/dist/src/drivers/drivers.c                                        |    24 +-
 external/bsd/wpa/dist/src/drivers/drivers.mak                                      |    20 +
 external/bsd/wpa/dist/src/drivers/drivers.mk                                       |    12 +
 external/bsd/wpa/dist/src/drivers/linux_ioctl.c                                    |     7 +-
 external/bsd/wpa/dist/src/drivers/netlink.c                                        |    36 +-
 external/bsd/wpa/dist/src/drivers/nl80211_copy.h                                   |  1315 +-
 external/bsd/wpa/dist/src/drivers/priv_netlink.h                                   |     1 +
 external/bsd/wpa/dist/src/eap_common/Makefile                                      |     2 +-
 external/bsd/wpa/dist/src/eap_common/eap_defs.h                                    |     8 +-
 external/bsd/wpa/dist/src/eap_common/eap_eke_common.c                              |   768 +
 external/bsd/wpa/dist/src/eap_common/eap_eke_common.h                              |   114 +
 external/bsd/wpa/dist/src/eap_common/eap_fast_common.c                             |     2 +-
 external/bsd/wpa/dist/src/eap_common/eap_fast_common.h                             |     2 +-
 external/bsd/wpa/dist/src/eap_common/eap_gpsk_common.c                             |   144 +-
 external/bsd/wpa/dist/src/eap_common/eap_gpsk_common.h                             |     6 +
 external/bsd/wpa/dist/src/eap_common/eap_ikev2_common.c                            |    12 +-
 external/bsd/wpa/dist/src/eap_common/eap_ikev2_common.h                            |     7 -
 external/bsd/wpa/dist/src/eap_common/eap_pwd_common.c                              |    17 +-
 external/bsd/wpa/dist/src/eap_common/eap_pwd_common.h                              |     2 +-
 external/bsd/wpa/dist/src/eap_common/eap_sim_common.c                              |    13 +-
 external/bsd/wpa/dist/src/eap_common/eap_sim_common.h                              |     3 +-
 external/bsd/wpa/dist/src/eap_common/ikev2_common.c                                |    77 +-
 external/bsd/wpa/dist/src/eap_common/ikev2_common.h                                |     4 -
 external/bsd/wpa/dist/src/eap_peer/Makefile                                        |     2 +-
 external/bsd/wpa/dist/src/eap_peer/eap.c                                           |   118 +-
 external/bsd/wpa/dist/src/eap_peer/eap.h                                           |     4 +
 external/bsd/wpa/dist/src/eap_peer/eap_aka.c                                       |   170 +-
 external/bsd/wpa/dist/src/eap_peer/eap_config.h                                    |    58 +-
 external/bsd/wpa/dist/src/eap_peer/eap_eke.c                                       |   765 +
 external/bsd/wpa/dist/src/eap_peer/eap_fast.c                                      |    72 +-
 external/bsd/wpa/dist/src/eap_peer/eap_fast_pac.c                                  |     2 +
 external/bsd/wpa/dist/src/eap_peer/eap_gpsk.c                                      |    88 +-
 external/bsd/wpa/dist/src/eap_peer/eap_i.h                                         |    20 +
 external/bsd/wpa/dist/src/eap_peer/eap_ikev2.c                                     |    64 +-
 external/bsd/wpa/dist/src/eap_peer/eap_leap.c                                      |     5 +-
 external/bsd/wpa/dist/src/eap_peer/eap_methods.h                                   |     2 +
 external/bsd/wpa/dist/src/eap_peer/eap_mschapv2.c                                  |    45 +-
 external/bsd/wpa/dist/src/eap_peer/eap_pax.c                                       |     6 +-
 external/bsd/wpa/dist/src/eap_peer/eap_peap.c                                      |   137 +-
 external/bsd/wpa/dist/src/eap_peer/eap_proxy.h                                     |    49 +
 external/bsd/wpa/dist/src/eap_peer/eap_proxy_dummy.c                               |    77 +
 external/bsd/wpa/dist/src/eap_peer/eap_psk.c                                       |    29 +-
 external/bsd/wpa/dist/src/eap_peer/eap_pwd.c                                       |   127 +-
 external/bsd/wpa/dist/src/eap_peer/eap_sake.c                                      |    27 +-
 external/bsd/wpa/dist/src/eap_peer/eap_sim.c                                       |   162 +-
 external/bsd/wpa/dist/src/eap_peer/eap_tls.c                                       |   111 +-
 external/bsd/wpa/dist/src/eap_peer/eap_tls_common.c                                |    70 +-
 external/bsd/wpa/dist/src/eap_peer/eap_tls_common.h                                |     4 +
 external/bsd/wpa/dist/src/eap_peer/eap_tnc.c                                       |     3 +-
 external/bsd/wpa/dist/src/eap_peer/eap_ttls.c                                      |    62 +-
 external/bsd/wpa/dist/src/eap_peer/eap_wsc.c                                       |    73 +-
 external/bsd/wpa/dist/src/eap_peer/ikev2.c                                         |    61 +-
 external/bsd/wpa/dist/src/eap_peer/mschapv2.c                                      |     4 +-
 external/bsd/wpa/dist/src/eap_peer/tncc.c                                          |    61 +-
 external/bsd/wpa/dist/src/eap_server/Makefile                                      |     2 +-
 external/bsd/wpa/dist/src/eap_server/eap.h                                         |    11 +
 external/bsd/wpa/dist/src/eap_server/eap_i.h                                       |     9 +
 external/bsd/wpa/dist/src/eap_server/eap_methods.h                                 |     2 +
 external/bsd/wpa/dist/src/eap_server/eap_server.c                                  |    64 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_aka.c                              |    15 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_eke.c                              |   793 +
 external/bsd/wpa/dist/src/eap_server/eap_server_fast.c                             |    27 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_gpsk.c                             |    32 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_gtc.c                              |     2 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_identity.c                         |     7 +
 external/bsd/wpa/dist/src/eap_server/eap_server_ikev2.c                            |    18 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_md5.c                              |     2 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_mschapv2.c                         |    17 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_pax.c                              |    17 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_peap.c                             |   135 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_psk.c                              |    26 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_pwd.c                              |    92 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_sake.c                             |    43 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_sim.c                              |    12 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_tls.c                              |    57 +
 external/bsd/wpa/dist/src/eap_server/eap_server_tnc.c                              |     3 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_ttls.c                             |    32 +-
 external/bsd/wpa/dist/src/eap_server/eap_sim_db.c                                  |    33 +-
 external/bsd/wpa/dist/src/eap_server/eap_tls_common.h                              |     1 +
 external/bsd/wpa/dist/src/eap_server/ikev2.c                                       |     4 +-
 external/bsd/wpa/dist/src/eap_server/tncs.c                                        |    79 +-
 external/bsd/wpa/dist/src/eapol_auth/Makefile                                      |     2 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_dump.c                             |   256 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.c                               |    29 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.h                               |     9 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm_i.h                             |     2 +
 external/bsd/wpa/dist/src/eapol_supp/Makefile                                      |     2 +-
 external/bsd/wpa/dist/src/eapol_supp/eapol_supp_sm.c                               |   210 +-
 external/bsd/wpa/dist/src/eapol_supp/eapol_supp_sm.h                               |    23 +-
 external/bsd/wpa/dist/src/l2_packet/Makefile                                       |     2 +-
 external/bsd/wpa/dist/src/l2_packet/l2_packet_none.c                               |     3 +-
 external/bsd/wpa/dist/src/p2p/Makefile                                             |     3 +-
 external/bsd/wpa/dist/src/p2p/p2p.c                                                |  1682 +-
 external/bsd/wpa/dist/src/p2p/p2p.h                                                |   283 +-
 external/bsd/wpa/dist/src/p2p/p2p_build.c                                          |    89 +-
 external/bsd/wpa/dist/src/p2p/p2p_dev_disc.c                                       |    88 +-
 external/bsd/wpa/dist/src/p2p/p2p_go_neg.c                                         |   619 +-
 external/bsd/wpa/dist/src/p2p/p2p_group.c                                          |   208 +-
 external/bsd/wpa/dist/src/p2p/p2p_i.h                                              |   119 +-
 external/bsd/wpa/dist/src/p2p/p2p_invitation.c                                     |   315 +-
 external/bsd/wpa/dist/src/p2p/p2p_parse.c                                          |    44 +
 external/bsd/wpa/dist/src/p2p/p2p_pd.c                                             |   123 +-
 external/bsd/wpa/dist/src/p2p/p2p_sd.c                                             |   316 +-
 external/bsd/wpa/dist/src/p2p/p2p_utils.c                                          |   360 +-
 external/bsd/wpa/dist/src/pae/Makefile                                             |     8 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_cp.c                                      |   744 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_cp.h                                      |    50 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay.c                                     |  3527 +++++
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay.h                                     |   194 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay_i.h                                   |   419 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_key.c                                     |   189 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_key.h                                     |    26 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.c                                |   492 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.h                                |    62 +
 external/bsd/wpa/dist/src/radius/Makefile                                          |     2 +-
 external/bsd/wpa/dist/src/radius/radius.c                                          |   200 +-
 external/bsd/wpa/dist/src/radius/radius.h                                          |    32 +-
 external/bsd/wpa/dist/src/radius/radius_client.c                                   |   207 +-
 external/bsd/wpa/dist/src/radius/radius_das.h                                      |     7 +
 external/bsd/wpa/dist/src/radius/radius_server.c                                   |   625 +-
 external/bsd/wpa/dist/src/radius/radius_server.h                                   |    18 +
 external/bsd/wpa/dist/src/rsn_supp/Makefile                                        |     2 +-
 external/bsd/wpa/dist/src/rsn_supp/peerkey.c                                       |   101 +-
 external/bsd/wpa/dist/src/rsn_supp/peerkey.h                                       |     7 +-
 external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.c                                   |    55 +-
 external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.h                                   |    14 +-
 external/bsd/wpa/dist/src/rsn_supp/preauth.c                                       |    14 +-
 external/bsd/wpa/dist/src/rsn_supp/preauth.h                                       |     6 +-
 external/bsd/wpa/dist/src/rsn_supp/tdls.c                                          |  1009 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa.c                                           |   526 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa.h                                           |    48 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_ft.c                                        |    51 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_i.h                                         |    32 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_ie.c                                        |   162 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_ie.h                                        |    16 +
 external/bsd/wpa/dist/src/tls/asn1.c                                               |    31 +-
 external/bsd/wpa/dist/src/tls/asn1.h                                               |     6 +-
 external/bsd/wpa/dist/src/tls/libtommath.c                                         |    12 +
 external/bsd/wpa/dist/src/tls/pkcs1.c                                              |   165 +-
 external/bsd/wpa/dist/src/tls/pkcs1.h                                              |     7 +
 external/bsd/wpa/dist/src/tls/rsa.c                                                |    25 +-
 external/bsd/wpa/dist/src/tls/rsa.h                                                |     3 +
 external/bsd/wpa/dist/src/tls/tlsv1_client.c                                       |     7 +-
 external/bsd/wpa/dist/src/tls/tlsv1_client_read.c                                  |   105 +-
 external/bsd/wpa/dist/src/tls/tlsv1_client_write.c                                 |     8 +-
 external/bsd/wpa/dist/src/tls/tlsv1_common.c                                       |   181 +-
 external/bsd/wpa/dist/src/tls/tlsv1_common.h                                       |    13 +-
 external/bsd/wpa/dist/src/tls/tlsv1_record.c                                       |     2 +-
 external/bsd/wpa/dist/src/tls/tlsv1_server.c                                       |   180 +-
 external/bsd/wpa/dist/src/tls/tlsv1_server.h                                       |     5 +
 external/bsd/wpa/dist/src/tls/tlsv1_server_i.h                                     |    13 +
 external/bsd/wpa/dist/src/tls/tlsv1_server_read.c                                  |   406 +-
 external/bsd/wpa/dist/src/tls/tlsv1_server_write.c                                 |   193 +-
 external/bsd/wpa/dist/src/tls/x509v3.c                                             |    22 +-
 external/bsd/wpa/dist/src/utils/Makefile                                           |     4 +-
 external/bsd/wpa/dist/src/utils/bitfield.c                                         |    89 +
 external/bsd/wpa/dist/src/utils/bitfield.h                                         |    21 +
 external/bsd/wpa/dist/src/utils/browser-android.c                                  |   117 +
 external/bsd/wpa/dist/src/utils/browser-system.c                                   |   112 +
 external/bsd/wpa/dist/src/utils/browser-wpadebug.c                                 |   124 +
 external/bsd/wpa/dist/src/utils/browser.c                                          |   219 +
 external/bsd/wpa/dist/src/utils/browser.h                                          |    21 +
 external/bsd/wpa/dist/src/utils/build_config.h                                     |    27 -
 external/bsd/wpa/dist/src/utils/common.c                                           |   276 +-
 external/bsd/wpa/dist/src/utils/common.h                                           |   189 +-
 external/bsd/wpa/dist/src/utils/edit.c                                             |     4 +-
 external/bsd/wpa/dist/src/utils/edit_readline.c                                    |     4 +-
 external/bsd/wpa/dist/src/utils/edit_simple.c                                      |     2 +-
 external/bsd/wpa/dist/src/utils/eloop.h                                            |    49 +
 external/bsd/wpa/dist/src/utils/eloop_win.c                                        |   226 +-
 external/bsd/wpa/dist/src/utils/ext_password_test.c                                |     2 +-
 external/bsd/wpa/dist/src/utils/http-utils.h                                       |    63 +
 external/bsd/wpa/dist/src/utils/http_curl.c                                        |  1641 ++
 external/bsd/wpa/dist/src/utils/ip_addr.c                                          |    24 -
 external/bsd/wpa/dist/src/utils/ip_addr.h                                          |     1 -
 external/bsd/wpa/dist/src/utils/os_internal.c                                      |    25 +
 external/bsd/wpa/dist/src/utils/os_none.c                                          |    11 +
 external/bsd/wpa/dist/src/utils/os_unix.c                                          |   131 +-
 external/bsd/wpa/dist/src/utils/os_win32.c                                         |    31 +
 external/bsd/wpa/dist/src/utils/pcsc_funcs.c                                       |    39 +-
 external/bsd/wpa/dist/src/utils/pcsc_funcs.h                                       |    11 +-
 external/bsd/wpa/dist/src/utils/platform.h                                         |    21 +
 external/bsd/wpa/dist/src/utils/radiotap.c                                         |   378 +-
 external/bsd/wpa/dist/src/utils/radiotap_iter.h                                    |   110 +-
 external/bsd/wpa/dist/src/utils/trace.c                                            |     9 +-
 external/bsd/wpa/dist/src/utils/utils_module_tests.c                               |   266 +
 external/bsd/wpa/dist/src/utils/wpa_debug.c                                        |   120 +-
 external/bsd/wpa/dist/src/utils/wpa_debug.h                                        |    66 +-
 external/bsd/wpa/dist/src/utils/xml-utils.c                                        |   471 +
 external/bsd/wpa/dist/src/utils/xml-utils.h                                        |    97 +
 external/bsd/wpa/dist/src/utils/xml_libxml2.c                                      |   457 +
 external/bsd/wpa/dist/src/wps/Makefile                                             |     2 +-
 external/bsd/wpa/dist/src/wps/http_client.c                                        |     2 +-
 external/bsd/wpa/dist/src/wps/http_server.c                                        |    10 +
 external/bsd/wpa/dist/src/wps/httpread.c                                           |    54 +-
 external/bsd/wpa/dist/src/wps/ndef.c                                               |    89 +-
 external/bsd/wpa/dist/src/wps/wps.c                                                |    62 +-
 external/bsd/wpa/dist/src/wps/wps.h                                                |   101 +-
 external/bsd/wpa/dist/src/wps/wps_attr_build.c                                     |   104 +-
 external/bsd/wpa/dist/src/wps/wps_attr_parse.c                                     |    43 +-
 external/bsd/wpa/dist/src/wps/wps_attr_parse.h                                     |     7 +-
 external/bsd/wpa/dist/src/wps/wps_attr_process.c                                   |    77 +-
 external/bsd/wpa/dist/src/wps/wps_common.c                                         |   353 +-
 external/bsd/wpa/dist/src/wps/wps_defs.h                                           |    22 +-
 external/bsd/wpa/dist/src/wps/wps_dev_attr.c                                       |    51 +-
 external/bsd/wpa/dist/src/wps/wps_dev_attr.h                                       |     6 +-
 external/bsd/wpa/dist/src/wps/wps_enrollee.c                                       |   246 +-
 external/bsd/wpa/dist/src/wps/wps_er.c                                             |   213 +-
 external/bsd/wpa/dist/src/wps/wps_er.h                                             |     1 +
 external/bsd/wpa/dist/src/wps/wps_er_ssdp.c                                        |     4 +-
 external/bsd/wpa/dist/src/wps/wps_i.h                                              |    23 +-
 external/bsd/wpa/dist/src/wps/wps_module_tests.c                                   |   337 +
 external/bsd/wpa/dist/src/wps/wps_registrar.c                                      |   330 +-
 external/bsd/wpa/dist/src/wps/wps_upnp.c                                           |    34 +-
 external/bsd/wpa/dist/src/wps/wps_upnp_ap.c                                        |     8 +-
 external/bsd/wpa/dist/src/wps/wps_upnp_i.h                                         |     3 +-
 external/bsd/wpa/dist/src/wps/wps_upnp_ssdp.c                                      |    29 +-
 external/bsd/wpa/dist/src/wps/wps_upnp_web.c                                       |    49 +-
 external/bsd/wpa/dist/src/wps/wps_validate.c                                       |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/Android.mk                                    |   178 +-
 external/bsd/wpa/dist/wpa_supplicant/ChangeLog                                     |   294 +
 external/bsd/wpa/dist/wpa_supplicant/Makefile                                      |   154 +-
 external/bsd/wpa/dist/wpa_supplicant/README                                        |   132 +-
 external/bsd/wpa/dist/wpa_supplicant/README-HS20                                   |    95 +-
 external/bsd/wpa/dist/wpa_supplicant/README-P2P                                    |    74 +-
 external/bsd/wpa/dist/wpa_supplicant/README-WPS                                    |    76 +-
 external/bsd/wpa/dist/wpa_supplicant/android.config                                |   134 +-
 external/bsd/wpa/dist/wpa_supplicant/ap.c                                          |   344 +-
 external/bsd/wpa/dist/wpa_supplicant/ap.h                                          |    24 +-
 external/bsd/wpa/dist/wpa_supplicant/bgscan.c                                      |     6 +-
 external/bsd/wpa/dist/wpa_supplicant/bgscan.h                                      |     5 +-
 external/bsd/wpa/dist/wpa_supplicant/bgscan_learn.c                                |    40 +-
 external/bsd/wpa/dist/wpa_supplicant/bgscan_simple.c                               |    12 +-
 external/bsd/wpa/dist/wpa_supplicant/bss.c                                         |   231 +-
 external/bsd/wpa/dist/wpa_supplicant/bss.h                                         |    17 +-
 external/bsd/wpa/dist/wpa_supplicant/config.c                                      |  1242 +-
 external/bsd/wpa/dist/wpa_supplicant/config.h                                      |   293 +-
 external/bsd/wpa/dist/wpa_supplicant/config_file.c                                 |   252 +-
 external/bsd/wpa/dist/wpa_supplicant/config_none.c                                 |     9 +-
 external/bsd/wpa/dist/wpa_supplicant/config_ssid.h                                 |   116 +-
 external/bsd/wpa/dist/wpa_supplicant/config_winreg.c                               |    16 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c                                  |  3137 +++-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.h                                  |     8 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_named_pipe.c                       |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_udp.c                              |   113 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_unix.c                             |   676 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/Makefile                                 |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_common.c                            |    27 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_dict_helpers.c                      |     3 +
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.c                               |   519 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.h                               |    40 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.c                      |   634 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.h                      |    43 +
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.c                  |   272 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.h                  |    24 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_wps.c                  |    57 +
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_helpers.c                       |    36 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_old.c                               |     2 +
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_old_handlers.c                      |    50 +-
 external/bsd/wpa/dist/wpa_supplicant/defconfig                                     |   119 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/Makefile                          |     3 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/eapol_test.8                      |   124 +
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/eapol_test.sgml                   |   205 +
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_background.8                  |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_background.sgml               |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_cli.8                         |    15 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_cli.sgml                      |    19 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.8                         |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.sgml                      |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.8                  |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.sgml               |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_priv.8                        |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_priv.sgml                     |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.8                  |    46 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5             |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.sgml               |    67 +-
 external/bsd/wpa/dist/wpa_supplicant/driver_i.h                                    |   424 +-
 external/bsd/wpa/dist/wpa_supplicant/eap_register.c                                |    12 +
 external/bsd/wpa/dist/wpa_supplicant/eapol_test.c                                  |   153 +-
 external/bsd/wpa/dist/wpa_supplicant/events.c                                      |  1433 +-
 external/bsd/wpa/dist/wpa_supplicant/examples/p2p-action.sh                        |    15 +-
 external/bsd/wpa/dist/wpa_supplicant/examples/p2p-nfc.py                           |   654 +
 external/bsd/wpa/dist/wpa_supplicant/examples/wps-nfc.py                           |   495 +-
 external/bsd/wpa/dist/wpa_supplicant/gas_query.c                                   |   253 +-
 external/bsd/wpa/dist/wpa_supplicant/gas_query.h                                   |     3 +-
 external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.c                             |   770 +-
 external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.h                             |    24 +-
 external/bsd/wpa/dist/wpa_supplicant/ibss_rsn.c                                    |   314 +-
 external/bsd/wpa/dist/wpa_supplicant/ibss_rsn.h                                    |    20 +
 external/bsd/wpa/dist/wpa_supplicant/interworking.c                                |  1271 +-
 external/bsd/wpa/dist/wpa_supplicant/interworking.h                                |     7 +-
 external/bsd/wpa/dist/wpa_supplicant/main.c                                        |    64 +-
 external/bsd/wpa/dist/wpa_supplicant/notify.c                                      |    74 +-
 external/bsd/wpa/dist/wpa_supplicant/notify.h                                      |     3 +
 external/bsd/wpa/dist/wpa_supplicant/offchannel.c                                  |    33 +-
 external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant.c                              |  4018 ++++-
 external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant.h                              |   247 +-
 external/bsd/wpa/dist/wpa_supplicant/preauth_test.c                                |     5 +-
 external/bsd/wpa/dist/wpa_supplicant/scan.c                                        |   862 +-
 external/bsd/wpa/dist/wpa_supplicant/scan.h                                        |    18 +-
 external/bsd/wpa/dist/wpa_supplicant/sme.c                                         |   406 +-
 external/bsd/wpa/dist/wpa_supplicant/sme.h                                         |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in   |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant.service.arg.in         |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/tests/test_wpa.c                              |     8 +-
 external/bsd/wpa/dist/wpa_supplicant/wifi_display.c                                |   138 +
 external/bsd/wpa/dist/wpa_supplicant/wifi_display.h                                |     4 +
 external/bsd/wpa/dist/wpa_supplicant/wnm_sta.c                                     |   607 +-
 external/bsd/wpa/dist/wpa_supplicant/wnm_sta.h                                     |    64 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.cpp                        |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_priv.c                                    |     8 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c                              |  1709 ++-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.conf                           |   247 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_i.h                            |   288 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_template.conf                  |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/wpas_glue.c                                   |   133 +-
 external/bsd/wpa/dist/wpa_supplicant/wpas_kay.c                                    |   378 +
 external/bsd/wpa/dist/wpa_supplicant/wpas_kay.h                                    |    41 +
 external/bsd/wpa/dist/wpa_supplicant/wpas_module_tests.c                           |   102 +
 external/bsd/wpa/dist/wpa_supplicant/wps_supplicant.c                              |  1101 +-
 external/bsd/wpa/dist/wpa_supplicant/wps_supplicant.h                              |    27 +-
 463 files changed, 78218 insertions(+), 15515 deletions(-)

diffs (truncated from 134944 to 300 lines):

diff -r a649e97bcdcb -r 85dfd2e3d230 external/bsd/wpa/dist/CONTRIBUTIONS
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/dist/CONTRIBUTIONS       Thu Oct 16 19:16:01 2014 +0000
@@ -0,0 +1,143 @@
+Contributions to hostap.git
+---------------------------
+
+This software is distributed under a permissive open source license to
+allow it to be used in any projects, whether open source or proprietary.
+Contributions to the project are welcome and it is important to maintain
+clear record of contributions and terms under which they are licensed.
+To help with this, following procedure is used to allow acceptance and
+recording of the terms.
+
+All contributions are expected to be licensed under the modified BSD
+license (see below). Acknowledgment of the terms is tracked through
+inclusion of Signed-off-by tag in the contributions at the end of the
+commit log message. This tag indicates that the contributor agrees with
+the Developer Certificate of Origin (DCO) version 1.1 terms (see below;
+also available from http://developercertificate.org/).
+
+
+The current requirements for contributions to hostap.git
+--------------------------------------------------------
+
+To indicate your acceptance of Developer's Certificate of Origin 1.1
+terms, please add the following line to the end of the commit message
+for each contribution you make to the project:
+
+Signed-off-by: Your Name <your%email.example.org@localhost>
+
+using your real name. Pseudonyms or anonymous contributions cannot
+unfortunately be accepted.
+
+
+History of license and contributions terms
+------------------------------------------
+
+Until February 11, 2012, in case of most files in hostap.git, "under the
+open source license indicated in the file" means that the contribution
+is licensed both under GPL v2 and modified BSD license (see below) and
+the choice between these licenses is given to anyone who redistributes
+or uses the software. As such, the contribution has to be licensed under
+both options to allow this choice.
+
+As of February 11, 2012, the project has chosen to use only the BSD
+license option for future distribution. As such, the GPL v2 license
+option is no longer used and the contributions are not required to be
+licensed until GPL v2. In case of most files in hostap.git, "under the
+open source license indicated in the file" means that the contribution
+is licensed under the modified BSD license (see below).
+
+Until February 13, 2014, the project used an extended version of the DCO
+that included the identical items (a) through (d) from DCO 1.1 and an
+additional item (e):
+
+(e) The contribution can be licensed under the modified BSD license
+    as shown below even in case of files that are currently licensed
+    under other terms.
+
+This was used during the period when some of the files included the old
+license terms. Acceptance of this extended DCO version was indicated
+with a Signed-hostap tag in the commit message. This additional item (e)
+was used to collect explicit approval to license the contribution with
+only the modified BSD license (see below), i.e., without the GPL v2
+option. This was done to allow simpler licensing terms to be used in the
+future. It should be noted that the modified BSD license is compatible
+with GNU GPL and as such, this possible move to simpler licensing option
+does not prevent use of this software in GPL projects.
+
+
+===[ start quote from http://developercertificate.org/ ]=======================
+
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+
+===[ end quote from http://developercertificate.org/ ]=========================
+
+
+The license terms used for hostap.git files
+-------------------------------------------
+
+Modified BSD license (no advertisement clause):
+
+Copyright (c) 2002-2014, Jouni Malinen <j%w1.fi@localhost> and contributors
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name(s) of the above-listed copyright holder(s) nor the
+   names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -r a649e97bcdcb -r 85dfd2e3d230 external/bsd/wpa/dist/README
--- a/external/bsd/wpa/dist/README      Thu Oct 16 19:11:38 2014 +0000
+++ b/external/bsd/wpa/dist/README      Thu Oct 16 19:16:01 2014 +0000
@@ -1,7 +1,7 @@
 wpa_supplicant and hostapd
 --------------------------
 
-Copyright (c) 2002-2012, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2014, Jouni Malinen <j%w1.fi@localhost> and contributors
 All Rights Reserved.
 
 These programs are licensed under the BSD license (the one with
diff -r a649e97bcdcb -r 85dfd2e3d230 external/bsd/wpa/dist/hostapd/Android.mk
--- a/external/bsd/wpa/dist/hostapd/Android.mk  Thu Oct 16 19:11:38 2014 +0000
+++ b/external/bsd/wpa/dist/hostapd/Android.mk  Thu Oct 16 19:16:01 2014 +0000
@@ -24,25 +24,36 @@
 # Set Android log name
 L_CFLAGS += -DANDROID_LOG_NAME=\"hostapd\"
 
+# Disable unused parameter warnings
+L_CFLAGS += -Wno-unused-parameter
+
+# Set Android extended P2P functionality
+L_CFLAGS += -DANDROID_P2P
+ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
+L_CFLAGS += -DANDROID_P2P_STUB
+endif
+
+# Use Android specific directory for control interface sockets
+L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
+L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/hostapd\"
+
 # To force sizeof(enum) = 4
 ifeq ($(TARGET_ARCH),arm)
 L_CFLAGS += -mabi=aapcs-linux
 endif
 
-# To allow non-ASCII characters in SSID
-L_CFLAGS += -DWPA_UNICODE_SSID
-
-# OpenSSL is configured without engines on Android
-L_CFLAGS += -DOPENSSL_NO_ENGINE
-
 INCLUDES = $(LOCAL_PATH)
 INCLUDES += $(LOCAL_PATH)/src
 INCLUDES += $(LOCAL_PATH)/src/utils
 INCLUDES += external/openssl/include
-INCLUDES += frameworks/base/cmds/keystore
+INCLUDES += system/security/keystore/include
 ifdef CONFIG_DRIVER_NL80211
+ifneq ($(wildcard external/libnl),)
+INCLUDES += external/libnl/include
+else
 INCLUDES += external/libnl-headers
 endif
+endif
 
 
 ifndef CONFIG_OS
@@ -127,10 +138,10 @@
 
 
 ifndef CONFIG_NO_DUMP_STATE
-# define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
-# a file (undefine it, if you want to save in binary size)
+# define HOSTAPD_DUMP_STATE to include support for dumping internal state
+# through control interface commands (undefine it, if you want to save in
+# binary size)
 L_CFLAGS += -DHOSTAPD_DUMP_STATE
-OBJS += dump_state.c
 OBJS += src/eapol_auth/eapol_auth_dump.c
 endif
 
@@ -140,6 +151,7 @@
 else
 OBJS += src/radius/radius.c
 OBJS += src/radius/radius_client.c
+OBJS += src/radius/radius_das.c
 endif
 
 ifdef CONFIG_NO_ACCOUNTING
@@ -186,6 +198,10 @@
 OBJS += src/ap/peerkey_auth.c
 endif
 
+ifdef CONFIG_HS20
+NEED_AES_OMAC1=y
+endif
+
 ifdef CONFIG_IEEE80211W
 L_CFLAGS += -DCONFIG_IEEE80211W
 NEED_SHA256=y
@@ -202,12 +218,24 @@
 
 ifdef CONFIG_SAE
 L_CFLAGS += -DCONFIG_SAE
+OBJS += src/common/sae.c
+NEED_ECC=y
+NEED_DH_GROUPS=y
+endif
+
+ifdef CONFIG_WNM
+L_CFLAGS += -DCONFIG_WNM
+OBJS += src/ap/wnm_ap.c
 endif
 
 ifdef CONFIG_IEEE80211N
 L_CFLAGS += -DCONFIG_IEEE80211N
 endif
 
+ifdef CONFIG_IEEE80211AC
+L_CFLAGS += -DCONFIG_IEEE80211AC
+endif
+
 include $(LOCAL_PATH)/src/drivers/drivers.mk
 
 OBJS += $(DRV_AP_OBJS)
@@ -244,6 +272,14 @@
 TLS_FUNCS=y
 endif
 
+ifdef CONFIG_EAP_UNAUTH_TLS
+L_CFLAGS += -DEAP_SERVER_UNAUTH_TLS
+ifndef CONFIG_EAP_TLS
+OBJS += src/eap_server/eap_server_tls.c
+TLS_FUNCS=y
+endif
+endif
+
 ifdef CONFIG_EAP_PEAP
 L_CFLAGS += -DEAP_SERVER_PEAP
 OBJS += src/eap_server/eap_server_peap.c
@@ -320,7 +356,7 @@
 L_CFLAGS += -DEAP_SERVER_GPSK
 OBJS += src/eap_server/eap_server_gpsk.c src/eap_common/eap_gpsk_common.c
 ifdef CONFIG_EAP_GPSK_SHA256
-L_CFLAGS += -DEAP_SERVER_GPSK_SHA256
+L_CFLAGS += -DEAP_GPSK_SHA256
 endif
 NEED_SHA256=y
 NEED_AES_OMAC1=y
@@ -332,6 +368,13 @@
 NEED_SHA256=y
 endif
 
+ifdef CONFIG_EAP_EKE
+L_CFLAGS += -DEAP_SERVER_EKE
+OBJS += src/eap_server/eap_server_eke.c src/eap_common/eap_eke_common.c
+NEED_DH_GROUPS=y
+NEED_DH_GROUPS_ALL=y
+endif
+
 ifdef CONFIG_EAP_VENDOR_TEST



Home | Main Index | Thread Index | Old Index