aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTIONS
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-01-27 13:40:23 -0800
committerDmitry Shmidt <dimitrysh@google.com>2015-01-27 13:40:23 -0800
commit40b07208ef4402da20a7f666835a62f6ec098e16 (patch)
tree2dda9e3e544abc1a57135190749ab0bac7c2e8c7 /CONTRIBUTIONS
parent432d603c922e970f55866c63212d29c997438977 (diff)
downloadandroid_external_wpa_supplicant_8-40b07208ef4402da20a7f666835a62f6ec098e16.tar.gz
android_external_wpa_supplicant_8-40b07208ef4402da20a7f666835a62f6ec098e16.tar.bz2
android_external_wpa_supplicant_8-40b07208ef4402da20a7f666835a62f6ec098e16.zip
Cumulative patch from commit 3f56a2b7460a57a2b68b48b936be134bf04aa36d
3f56a2b Ignore pmf=1 default if driver does not support PMF fa38860 nl80211: Fix build with libnl 1.1 937403b Update copyright notices for the new year 2015 399e613 Add Suite B AKMs to key_mgmt capability list 5e3b519 Add Suite B 192-bit AKM 97ae35a Add HMAC-SHA384 98cd3d1 Preparations for variable length KCK and KEK 30bff1d Extend AES-CMAC routines to support 256-bit keys 86f9b1c nl80211: Fix default group key management index configuration b5f045d Show supported group_mgmt capabilities 893e152 Interworking: More debug messages f45bae5 Interworking: Add logging to track nai_realm_find_eap failures 5a5aab7 Interworking: Remove unnecessary NULL check 400de9b hostapd: Debug messages for dodgy RADIUS servers ad905e4 wpa_gui: Sort frequency and signal numerically in the scan results dialog c35e35e Add passive_scan configuration parameter bff162a P2P: Fix NULL pointer dereference with SD query cancellation 630b323 nl80211: Increase netlink receive buffer size Change-Id: I32d4bd934ad76e24c646e9925bb839b1ba2a148e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'CONTRIBUTIONS')
-rw-r--r--CONTRIBUTIONS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTIONS b/CONTRIBUTIONS
index d20a5566..ca09bae6 100644
--- a/CONTRIBUTIONS
+++ b/CONTRIBUTIONS
@@ -112,7 +112,7 @@ The license terms used for hostap.git files
Modified BSD license (no advertisement clause):
-Copyright (c) 2002-2014, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2015, Jouni Malinen <j@w1.fi> and contributors
All Rights Reserved.
Redistribution and use in source and binary forms, with or without