git.osdn.net Git - android-x86/external-wpa

Chih-Wei Huang [Thu, 2 Sep 2010 07:06:41 +0000 (15:06 +0800)]

change wifi.interface to wlan.interface

It seems we can't set wifi.interface in libhardware_legacy.

Change-Id: Ifdfa838e33850958ca442f269e1c12683e5fc9f4

commit | commitdiff | tree

Nicu Pavel [Wed, 5 May 2010 20:43:15 +0000 (23:43 +0300)]

Added a separate driver(awext) to emulate Android driver commands.

Change-Id: Ieb59015a62916b34a677e191b9df329eaaa30814

commit | commitdiff | tree

Dmitry Shmidt [Thu, 25 Mar 2010 21:22:48 +0000 (14:22 -0700)]

Fix status from ap_scan command

Change-Id: Ib7bf2e9ef6f602ea0f95314cb2db7b3d42276c31
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Mon, 15 Mar 2010 20:37:09 +0000 (13:37 -0700)]

Restrict external scan requests during association stage

Change-Id: I159d7288bf8c78342394a65acf3e7086b0761b84
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:48 +0000 (18:04 -0800)]

Add an empty CleanSpec.mk

Change-Id: Ie18598a9fb3bae6f84c531a439670994238037a0

commit | commitdiff | tree

Chia-chi Yeh [Mon, 8 Mar 2010 09:25:27 +0000 (17:25 +0800)]

modify according to the change of keystore interface.

Change-Id: I2436708731a8a2c0faf6124c1bb3dceb6c8867ed

commit | commitdiff | tree

Dmitry Shmidt [Fri, 26 Feb 2010 18:54:59 +0000 (10:54 -0800)]

Reset scan_ongoing flag if scan is canceled

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Wed, 24 Feb 2010 18:43:49 +0000 (10:43 -0800)]

Update priority list after changing priority

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

The Android Open Source Project [Fri, 5 Feb 2010 22:08:34 +0000 (14:08 -0800)]

am 2cbe35e5: am 663c39d4: reconcile main tree with open-source eclair

Merge commit '2cbe35e5b24ecbdbd114248b1fb8010926d80567'

* commit '2cbe35e5b24ecbdbd114248b1fb8010926d80567':
android-2.1_r1 snapshot

commit | commitdiff | tree

The Android Open Source Project [Fri, 5 Feb 2010 16:22:15 +0000 (08:22 -0800)]

am 663c39d4: reconcile main tree with open-source eclair

Merge commit '663c39d4fd672cd52ca852d0717bfec955ebfa98' into eclair-plus-aosp

* commit '663c39d4fd672cd52ca852d0717bfec955ebfa98':
android-2.1_r1 snapshot

commit | commitdiff | tree

The Android Open Source Project [Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)]

reconcile main tree with open-source eclair

commit | commitdiff | tree

Dmitry Shmidt [Fri, 5 Feb 2010 02:05:01 +0000 (18:05 -0800)]

Add SIGSEGV processing to send terminating message

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Mon, 1 Feb 2010 18:38:27 +0000 (10:38 -0800)]

Merge "Remove compilation warning"

commit | commitdiff | tree

Dmitry Shmidt [Mon, 1 Feb 2010 18:34:41 +0000 (10:34 -0800)]

Remove compilation warning

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

The Android Open Source Project [Fri, 29 Jan 2010 22:08:58 +0000 (14:08 -0800)]

reconcile android-2.1_r1 snapshot

commit | commitdiff | tree

Chia-chi Yeh [Thu, 28 Jan 2010 16:22:32 +0000 (00:22 +0800)]

wpa_supplicant: extend set_network to allow string variables to be unset.

To unset a variable, use NULL without quotation as the value in set_network.

Back ported from wpa_supplicant 0.6.x b56c0546b7e46f221d751ef7390fbfec607254e2.

commit | commitdiff | tree

The Android Open Source Project [Tue, 12 Jan 2010 23:18:51 +0000 (15:18 -0800)]

android-2.1_r1 snapshot

commit | commitdiff | tree

Android Git Automerger [Tue, 15 Dec 2009 08:44:41 +0000 (00:44 -0800)]

Merge commit 'goog/eclair-plus-aosp'

commit | commitdiff | tree

Dmitry Shmidt [Thu, 10 Dec 2009 00:25:51 +0000 (16:25 -0800)]

am eb773ebf: (-s ours) am e3b0be17: am 6a115696: (-s ours) driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Merge commit 'eb773ebf3df3fe8bcfef85849599813781f8ef62'

* commit 'eb773ebf3df3fe8bcfef85849599813781f8ef62':
driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

commit | commitdiff | tree

Dmitry Shmidt [Wed, 9 Dec 2009 23:51:24 +0000 (15:51 -0800)]

am e3b0be17: am 6a115696: (-s ours) driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Merge commit 'e3b0be17a148bd51c38d142baa12947b9990b634' into eclair-mr2-plus-aosp

* commit 'e3b0be17a148bd51c38d142baa12947b9990b634':
driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 8 Dec 2009 21:44:04 +0000 (13:44 -0800)]

am 6a115696: driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Merge commit '6a115696c36f5e76efd18342af10953f5d8da914' into eclair-plus-aosp

* commit '6a115696c36f5e76efd18342af10953f5d8da914':
driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 8 Dec 2009 21:43:56 +0000 (13:43 -0800)]

am 6a115696: (-s ours) driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Merge commit '6a115696c36f5e76efd18342af10953f5d8da914' into eclair-mr2

* commit '6a115696c36f5e76efd18342af10953f5d8da914':
driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 8 Dec 2009 19:03:48 +0000 (11:03 -0800)]

driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Tue, 24 Nov 2009 18:43:35 +0000 (10:43 -0800)]

am 0080c796: am aea96d8d: WEXT: Add "HANGED" processing

Merge commit '0080c796226f35669a2b7ed0e58e4485323692ff'

* commit '0080c796226f35669a2b7ed0e58e4485323692ff':
WEXT: Add "HANGED" processing

commit | commitdiff | tree

Dmitry Shmidt [Tue, 24 Nov 2009 18:39:04 +0000 (10:39 -0800)]

am aea96d8d: WEXT: Add "HANGED" processing

Merge commit 'aea96d8d72b9ced7f60b9de38e2e87e6a4a6125a' into eclair-mr2-plus-aosp

* commit 'aea96d8d72b9ced7f60b9de38e2e87e6a4a6125a':
WEXT: Add "HANGED" processing

commit | commitdiff | tree

Dmitry Shmidt [Tue, 24 Nov 2009 18:32:41 +0000 (10:32 -0800)]

WEXT: Add "HANGED" processing

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Mon, 23 Nov 2009 18:48:11 +0000 (10:48 -0800)]

am 78eb90b0: am 68b591fa: am c7da28cb: Set interface down in case of "driver stop" command (b/2271658)

Merge commit '78eb90b055f8880139e4c690715051517a7c33a9'

* commit '78eb90b055f8880139e4c690715051517a7c33a9':
Set interface down in case of "driver stop" command (b/2271658)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 23 Nov 2009 18:43:13 +0000 (10:43 -0800)]

am 68b591fa: am c7da28cb: Set interface down in case of "driver stop" command (b/2271658)

Merge commit '68b591fa9047f2df4ac6b346e10e4879f84e95ee' into eclair-mr2-plus-aosp

* commit '68b591fa9047f2df4ac6b346e10e4879f84e95ee':
Set interface down in case of "driver stop" command (b/2271658)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 23 Nov 2009 18:37:36 +0000 (10:37 -0800)]

am c7da28cb: Set interface down in case of "driver stop" command (b/2271658)

Merge commit 'c7da28cb6aa09404070f3479be54e23609552feb' into eclair-plus-aosp

* commit 'c7da28cb6aa09404070f3479be54e23609552feb':
Set interface down in case of "driver stop" command (b/2271658)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 23 Nov 2009 18:37:02 +0000 (10:37 -0800)]

am c7da28cb: Set interface down in case of "driver stop" command (b/2271658)

Merge commit 'c7da28cb6aa09404070f3479be54e23609552feb' into eclair-mr2

* commit 'c7da28cb6aa09404070f3479be54e23609552feb':
Set interface down in case of "driver stop" command (b/2271658)

commit | commitdiff | tree

Dmitry Shmidt [Sat, 21 Nov 2009 02:21:55 +0000 (18:21 -0800)]

Set interface down in case of "driver stop" command (b/2271658)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Tue, 17 Nov 2009 23:09:41 +0000 (15:09 -0800)]

am cce8160f: am cef0cae9: am 0ebb71cf: wext: Use probe scan only for hidden networks (b/2262258)

Merge commit 'cce8160f1471e73f9b4bbe737547485c9b298e6d'

* commit 'cce8160f1471e73f9b4bbe737547485c9b298e6d':
wext: Use probe scan only for hidden networks (b/2262258)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 17 Nov 2009 18:10:55 +0000 (10:10 -0800)]

am cef0cae9: am 0ebb71cf: wext: Use probe scan only for hidden networks (b/2262258)

Merge commit 'cef0cae916e22f4e2179b88e7ef57a3372ab7ada' into eclair-mr2-plus-aosp

* commit 'cef0cae916e22f4e2179b88e7ef57a3372ab7ada':
wext: Use probe scan only for hidden networks (b/2262258)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 17 Nov 2009 18:08:33 +0000 (10:08 -0800)]

am 0ebb71cf: wext: Use probe scan only for hidden networks (b/2262258)

Merge commit '0ebb71cfe0d43f8288055b20a96452d36713d845' into eclair-plus-aosp

* commit '0ebb71cfe0d43f8288055b20a96452d36713d845':
wext: Use probe scan only for hidden networks (b/2262258)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 17 Nov 2009 18:08:30 +0000 (10:08 -0800)]

am 0ebb71cf: wext: Use probe scan only for hidden networks (b/2262258)

Merge commit '0ebb71cfe0d43f8288055b20a96452d36713d845' into eclair-mr2

* commit '0ebb71cfe0d43f8288055b20a96452d36713d845':
wext: Use probe scan only for hidden networks (b/2262258)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 17 Nov 2009 17:52:44 +0000 (09:52 -0800)]

wext: Use probe scan only for hidden networks (b/2262258)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Jean-Baptiste Queru [Sun, 15 Nov 2009 23:07:53 +0000 (15:07 -0800)]

am 3ea0e823: merge from open-source master

Merge commit '3ea0e8237905b833a136b30f06e80fa385aa2a88'

* commit '3ea0e8237905b833a136b30f06e80fa385aa2a88':
eclair snapshot

commit | commitdiff | tree

Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:19 +0000 (14:55 -0800)]

merge from open-source master

commit | commitdiff | tree

Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:24 +0000 (14:06 -0800)]

merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD

commit | commitdiff | tree

Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:17 +0000 (12:06 -0800)]

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:52 +0000 (18:45 -0800)]

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:35:47 +0000 (17:35 -0800)]

am 899d317e: am be5cce4a: Check if interface is valid in wpa_ctrl_close()

Merge commit '899d317e4055907075c6adf713bf9d1fe500c5f1'

* commit '899d317e4055907075c6adf713bf9d1fe500c5f1':
Check if interface is valid in wpa_ctrl_close()

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:35:44 +0000 (17:35 -0800)]

am 40d9006e: am cf3c05b7: am f02dfc26: Use real rssi value for rssi-approx command (b/2213699)

Merge commit '40d9006ebd853877a89878b3592b0f3d42906abb'

* commit '40d9006ebd853877a89878b3592b0f3d42906abb':
Use real rssi value for rssi-approx command (http://b/2213699)

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:35:40 +0000 (17:35 -0800)]

am d54f6f04: am 5476383b: am 4b3af3f6: Add scan-channels command support (b/2213691)

Merge commit 'd54f6f044ee00f22d745275426c7a1a749e44354'

* commit 'd54f6f044ee00f22d745275426c7a1a749e44354':
Add scan-channels command support (http://b/2213691)

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:31:27 +0000 (17:31 -0800)]

am be5cce4a: Check if interface is valid in wpa_ctrl_close()

Merge commit 'be5cce4a3dc21ccdeaaa510cb01fdcff5f6716cc' into eclair-mr2-plus-aosp

* commit 'be5cce4a3dc21ccdeaaa510cb01fdcff5f6716cc':
Check if interface is valid in wpa_ctrl_close()

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:31:24 +0000 (17:31 -0800)]

am cf3c05b7: am f02dfc26: Use real rssi value for rssi-approx command (b/2213699)

Merge commit 'cf3c05b78e8d0f3816f5b9611af18ec301e338d0' into eclair-mr2-plus-aosp

* commit 'cf3c05b78e8d0f3816f5b9611af18ec301e338d0':
Use real rssi value for rssi-approx command (http://b/2213699)

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:31:20 +0000 (17:31 -0800)]

am 5476383b: am 4b3af3f6: Add scan-channels command support (b/2213691)

Merge commit '5476383b6e5ac5baec1cae3e88a1df5d214fb16d' into eclair-mr2-plus-aosp

* commit '5476383b6e5ac5baec1cae3e88a1df5d214fb16d':
Add scan-channels command support (http://b/2213691)

commit | commitdiff | tree

Dmitry Shmidt [Thu, 12 Nov 2009 01:13:36 +0000 (17:13 -0800)]

Check if interface is valid in wpa_ctrl_close()

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Wed, 4 Nov 2009 00:12:23 +0000 (16:12 -0800)]

am f02dfc26: Use real rssi value for rssi-approx command (b/2213699)

Merge commit 'f02dfc26f9c2a492e066582e7c739e11b0e88ff5' into eclair-mr2

* commit 'f02dfc26f9c2a492e066582e7c739e11b0e88ff5':
Use real rssi value for rssi-approx command (http://b/2213699)

commit | commitdiff | tree

Dmitry Shmidt [Wed, 4 Nov 2009 00:11:51 +0000 (16:11 -0800)]

am f02dfc26: Use real rssi value for rssi-approx command (b/2213699)

Merge commit 'f02dfc26f9c2a492e066582e7c739e11b0e88ff5' into eclair-plus-aosp

* commit 'f02dfc26f9c2a492e066582e7c739e11b0e88ff5':
Use real rssi value for rssi-approx command (http://b/2213699)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 3 Nov 2009 23:53:04 +0000 (15:53 -0800)]

Use real rssi value for rssi-approx command (b/2213699)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Tue, 3 Nov 2009 22:55:00 +0000 (14:55 -0800)]

am 4b3af3f6: Add scan-channels command support (b/2213691)

Merge commit '4b3af3f6ce0edf38a393c9a55e68a8d94725d810' into eclair-mr2

* commit '4b3af3f6ce0edf38a393c9a55e68a8d94725d810':
Add scan-channels command support (http://b/2213691)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 3 Nov 2009 22:54:43 +0000 (14:54 -0800)]

am 4b3af3f6: Add scan-channels command support (b/2213691)

Merge commit '4b3af3f6ce0edf38a393c9a55e68a8d94725d810' into eclair-plus-aosp

* commit '4b3af3f6ce0edf38a393c9a55e68a8d94725d810':
Add scan-channels command support (http://b/2213691)

commit | commitdiff | tree

Dmitry Shmidt [Tue, 3 Nov 2009 22:41:57 +0000 (14:41 -0800)]

Add scan-channels command support (b/2213691)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Mon, 19 Oct 2009 22:33:59 +0000 (15:33 -0700)]

am c0b56777: am 434b16e5: am d5a0f104: Increase timeout for responce to 10 sec (b/issue?id=2182998)

Merge commit 'c0b56777d193d9cd5807eb9f299d170dfa76f4aa'

* commit 'c0b56777d193d9cd5807eb9f299d170dfa76f4aa':
Increase timeout for responce to 10 sec (http://b/issue?id=2182998)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 19 Oct 2009 22:27:02 +0000 (15:27 -0700)]

am 434b16e5: am d5a0f104: Increase timeout for responce to 10 sec (b/issue?id=2182998)

Merge commit '434b16e5d9a20883873e949466dc7152b12092ad' into eclair-mr2-plus-aosp

* commit '434b16e5d9a20883873e949466dc7152b12092ad':
Increase timeout for responce to 10 sec (http://b/issue?id=2182998)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 19 Oct 2009 22:16:07 +0000 (15:16 -0700)]

am d5a0f104: Increase timeout for responce to 10 sec (b/issue?id=2182998)

Merge commit 'd5a0f104169d75797a64bd269138101cae801345' into eclair-plus-aosp

* commit 'd5a0f104169d75797a64bd269138101cae801345':
Increase timeout for responce to 10 sec (http://b/issue?id=2182998)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 19 Oct 2009 22:15:45 +0000 (15:15 -0700)]

am d5a0f104: Increase timeout for responce to 10 sec (b/issue?id=2182998)

Merge commit 'd5a0f104169d75797a64bd269138101cae801345' into eclair-mr2

* commit 'd5a0f104169d75797a64bd269138101cae801345':
Increase timeout for responce to 10 sec (http://b/issue?id=2182998)

commit | commitdiff | tree

Dmitry Shmidt [Mon, 19 Oct 2009 16:54:56 +0000 (09:54 -0700)]

Increase timeout for responce to 10 sec (b/issue?id=2182998)

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 14 Oct 2009 23:19:15 +0000 (16:19 -0700)]

am 72b116f9: merge from open-source master

Merge commit '72b116f91f7343d1893caec3db7c11fcd16c446a'

* commit '72b116f91f7343d1893caec3db7c11fcd16c446a':

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:14 +0000 (16:02 -0700)]

merge from open-source master

commit | commitdiff | tree

Chia-chi Yeh [Mon, 12 Oct 2009 19:29:10 +0000 (12:29 -0700)]

am 8e30f5e8: wpa_supplicant: remove AID_KEYSTORE from the group list.

Merge commit '8e30f5e8ddcbcbef1417fbc68e7e9c743e0c2130'

* commit '8e30f5e8ddcbcbef1417fbc68e7e9c743e0c2130':
wpa_supplicant: remove AID_KEYSTORE from the group list.

commit | commitdiff | tree

Dmitry Shmidt [Mon, 12 Oct 2009 18:24:54 +0000 (11:24 -0700)]

am d3f40c7f: Increase buffer size for scan results to 8K

Merge commit 'd3f40c7fa6dafacc9ca5d4652014df5c1219b6a4'

* commit 'd3f40c7fa6dafacc9ca5d4652014df5c1219b6a4':
Increase buffer size for scan results to 8K

commit | commitdiff | tree

Chia-chi Yeh [Mon, 12 Oct 2009 18:24:51 +0000 (11:24 -0700)]

am b84975e4: wpa_supplicant: check if ca_cert is null.

Merge commit 'b84975e4867f61e0c539cd2d782991900080e95a'

* commit 'b84975e4867f61e0c539cd2d782991900080e95a':
wpa_supplicant: check if ca_cert is null.

commit | commitdiff | tree

Chia-chi Yeh [Mon, 12 Oct 2009 18:24:48 +0000 (11:24 -0700)]

am 3630a058: wpa_supplicant: push keystore access to tls_openssl.c.

Merge commit '3630a058cb0c57d0f6da9568098471163535d4cf'

* commit '3630a058cb0c57d0f6da9568098471163535d4cf':
wpa_supplicant: push keystore access to tls_openssl.c.

commit | commitdiff | tree

Dmitry Shmidt [Wed, 7 Oct 2009 18:40:27 +0000 (11:40 -0700)]

am d3f40c7f: Increase buffer size for scan results to 8K

Merge commit 'd3f40c7fa6dafacc9ca5d4652014df5c1219b6a4' into eclair-plus-aosp

* commit 'd3f40c7fa6dafacc9ca5d4652014df5c1219b6a4':
Increase buffer size for scan results to 8K

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:40:24 +0000 (11:40 -0700)]

am b84975e4: wpa_supplicant: check if ca_cert is null.

Merge commit 'b84975e4867f61e0c539cd2d782991900080e95a' into eclair-plus-aosp

* commit 'b84975e4867f61e0c539cd2d782991900080e95a':
wpa_supplicant: check if ca_cert is null.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:40:20 +0000 (11:40 -0700)]

am 3630a058: wpa_supplicant: push keystore access to tls_openssl.c.

Merge commit '3630a058cb0c57d0f6da9568098471163535d4cf' into eclair-plus-aosp

* commit '3630a058cb0c57d0f6da9568098471163535d4cf':
wpa_supplicant: push keystore access to tls_openssl.c.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 08:57:25 +0000 (16:57 +0800)]

wpa_supplicant: remove AID_KEYSTORE from the group list.

commit | commitdiff | tree

Dmitry Shmidt [Fri, 2 Oct 2009 20:38:19 +0000 (13:38 -0700)]

Increase buffer size for scan results to 8K

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Thu, 1 Oct 2009 18:41:45 +0000 (11:41 -0700)]

am 064562a8: am 4866d77c: Ensure to have interface UP before association.

Merge commit '064562a8c88d58a67fb93a9aa6c28600450c7dcd'

* commit '064562a8c88d58a67fb93a9aa6c28600450c7dcd':
Ensure to have interface UP before association.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 1 Oct 2009 16:54:02 +0000 (00:54 +0800)]

wpa_supplicant: check if ca_cert is null.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 1 Oct 2009 16:40:48 +0000 (00:40 +0800)]

wpa_supplicant: push keystore access to tls_openssl.c.

Since we support certificate chain, doing it in eap_tls_common.c becomes too complicated.
To make things simpler, push the logic to tls_openssl.c and use keystore namespace instead.

commit | commitdiff | tree

Dmitry Shmidt [Tue, 29 Sep 2009 23:23:56 +0000 (16:23 -0700)]

am 4866d77c: Ensure to have interface UP before association.

Merge commit '4866d77cee4db6487f8df017059c74df93b2568a' into eclair-plus-aosp

* commit '4866d77cee4db6487f8df017059c74df93b2568a':
Ensure to have interface UP before association.

commit | commitdiff | tree

Dmitry Shmidt [Tue, 29 Sep 2009 23:14:34 +0000 (16:14 -0700)]

Ensure to have interface UP before association.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Chia-chi Yeh [Mon, 21 Sep 2009 06:06:25 +0000 (23:06 -0700)]

am ee463923: am d5170539: wpa_supplicant: switch to multi-user keystore.

Merge commit 'ee46392362e5242809b4337700cc5660086f8f80'

* commit 'ee46392362e5242809b4337700cc5660086f8f80':
wpa_supplicant: switch to multi-user keystore.

commit | commitdiff | tree

Chia-chi Yeh [Mon, 21 Sep 2009 03:46:44 +0000 (20:46 -0700)]

am d5170539: wpa_supplicant: switch to multi-user keystore.

Merge commit 'd5170539a3a845498356692538ba0846cb1fc84e' into eclair-plus-aosp

* commit 'd5170539a3a845498356692538ba0846cb1fc84e':
wpa_supplicant: switch to multi-user keystore.

commit | commitdiff | tree

Chia-chi Yeh [Fri, 18 Sep 2009 09:35:06 +0000 (17:35 +0800)]

wpa_supplicant: switch to multi-user keystore.

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:19 +0000 (11:06 -0700)]

am a1e794f5: merge from open-source master

Merge commit 'a1e794f5b96ac2b877e38f205a8e4922bbecad75'

* commit 'a1e794f5b96ac2b877e38f205a8e4922bbecad75':

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:02 +0000 (07:51 -0700)]

merge from open-source master

commit | commitdiff | tree

Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:05 +0000 (14:13 -0700)]

commit | commitdiff | tree

Kenny Root [Wed, 2 Sep 2009 20:32:34 +0000 (13:32 -0700)]

am a63def2b: am e31782f9: cherry-pick: wpa_supplicant: disable OpenSSL engine.

Merge commit 'a63def2b22fd9fa118e99dc3ceeeaba55d77f15d'

* commit 'a63def2b22fd9fa118e99dc3ceeeaba55d77f15d':
cherry-pick: wpa_supplicant: disable OpenSSL engine.

commit | commitdiff | tree

Kenny Root [Wed, 2 Sep 2009 07:15:27 +0000 (00:15 -0700)]

am e31782f9: cherry-pick: wpa_supplicant: disable OpenSSL engine.

Merge commit 'e31782f9ee6d37e86a786c4f2d707ef19cecb4f4' into eclair-plus-aosp

* commit 'e31782f9ee6d37e86a786c4f2d707ef19cecb4f4':
cherry-pick: wpa_supplicant: disable OpenSSL engine.

commit | commitdiff | tree

Kenny Root [Wed, 26 Aug 2009 06:47:07 +0000 (01:47 -0500)]

cherry-pick: wpa_supplicant: disable OpenSSL engine.

Change-Id: I53c8381a743b4c97857d61af813d7e408e2e5ea8

commit | commitdiff | tree

Chung-yih Wang [Wed, 2 Sep 2009 02:45:27 +0000 (19:45 -0700)]

am 7a4a2fd6: am c71b33c4: Support certificate chain for CA cert from blob data.

Merge commit '7a4a2fd62a535217bbb620dbb29b89eec32e9871'

* commit '7a4a2fd62a535217bbb620dbb29b89eec32e9871':
Support certificate chain for CA cert from blob data.

commit | commitdiff | tree

Chung-yih Wang [Wed, 2 Sep 2009 02:43:55 +0000 (19:43 -0700)]

am c71b33c4: Support certificate chain for CA cert from blob data.

Merge commit 'c71b33c4b0968b34be24a02f2d27ef75747052d7' into eclair-plus-aosp

* commit 'c71b33c4b0968b34be24a02f2d27ef75747052d7':
Support certificate chain for CA cert from blob data.

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Sep 2009 19:14:31 +0000 (12:14 -0700)]

am d76b8364: merge from open-source master

Merge commit 'd76b8364a815fb5dda354dfc3f64f4493a5929c4'

* commit 'd76b8364a815fb5dda354dfc3f64f4493a5929c4':
Don't use OpenSSL Engines in wpa_supplicant

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 1 Sep 2009 15:32:11 +0000 (08:32 -0700)]

merge from open-source master

commit | commitdiff | tree

Chung-yih Wang [Tue, 1 Sep 2009 08:36:06 +0000 (16:36 +0800)]

Support certificate chain for CA cert from blob data.

We have to use PEM format for blob data and modify the ca_cert handling to
support certificate chain for CA certificates. Since the original code
can not support the CA chain from blob.

commit | commitdiff | tree

Kenny Root [Wed, 26 Aug 2009 06:47:07 +0000 (01:47 -0500)]

Don't use OpenSSL Engines in wpa_supplicant

The Android OpenSSL tree directs us to remove the engines subdir, so we
shouldn't try to use engines in wpa_supplicant.

Change-Id: I53c8381a743b4c97857d61af813d7e408e2e5ea8

commit | commitdiff | tree

Dmitry Shmidt [Thu, 20 Aug 2009 19:18:17 +0000 (12:18 -0700)]

am 61149877: Increase interface up delay and check we_version_compiled

Merge commit '61149877668f2d0c95a9b9b0155f43b4191040bc'

* commit '61149877668f2d0c95a9b9b0155f43b4191040bc':
Increase interface up delay and check we_version_compiled

commit | commitdiff | tree

Mike Lockwood [Thu, 20 Aug 2009 19:18:16 +0000 (12:18 -0700)]

am da26fb79: Add support for non-ASCII characters in the SSID

Merge commit 'da26fb79a1162a337132aa2cfc3defe3035b0a20'

* commit 'da26fb79a1162a337132aa2cfc3defe3035b0a20':
Add support for non-ASCII characters in the SSID

commit | commitdiff | tree

Dmitry Shmidt [Thu, 20 Aug 2009 19:10:19 +0000 (12:10 -0700)]

Increase interface up delay and check we_version_compiled

Signed-off-by: Zheng BaoZhong-E13358 <bao-zhong@motorola.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Wed, 19 Aug 2009 22:57:41 +0000 (15:57 -0700)]

Preparing to support different wpa_supplicant versions

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Mike Lockwood [Wed, 12 Aug 2009 00:57:17 +0000 (20:57 -0400)]

Add support for non-ASCII characters in the SSID

Signed-off-by: Mike Lockwood <lockwood@android.com>

commit | commitdiff | tree

Dmitry Shmidt [Thu, 13 Aug 2009 16:03:20 +0000 (09:03 -0700)]

Fix scan rescheduling delay when new network is added

Signed-off-by: Zheng BaoZhong-E13358 <bao-zhong@motorola.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit | commitdiff | tree

Dmitry Shmidt [Wed, 12 Aug 2009 16:53:49 +0000 (09:53 -0700)]

Fix 5.5.2 PMK Caching issue

Signed-off-by: Zheng BaoZhong-E13358 <bao-zhong@motorola.com>

commit | commitdiff | tree

Chia-chi Yeh [Thu, 6 Aug 2009 18:16:47 +0000 (11:16 -0700)]

am 5f010682: wpa_supplicant: Remove unnecessary messages.

Merge commit '5f0106824621dbd0c47169af8a1f3f6fbe27a837'

* commit '5f0106824621dbd0c47169af8a1f3f6fbe27a837':
wpa_supplicant: Remove unnecessary messages.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 5 Aug 2009 19:41:13 +0000 (03:41 +0800)]

wpa_supplicant: Remove unnecessary messages.

1. Remove MSG_MSGDUMP/MSG_DEBUG calls.
2. Remove calls to dump data to stdout.
3. Turn off log-to-file support.

This saves 64 kilobytes.

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:23 +0000 (09:00 -0700)]