OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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)
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)
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>
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)
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)
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>
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:14 +0000 (16:02 -0700)]
merge from open-source master
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
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.
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.
Chia-chi Yeh [Wed, 7 Oct 2009 08:57:25 +0000 (16:57 +0800)]
wpa_supplicant: remove AID_KEYSTORE from the group list.
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>
Chia-chi Yeh [Thu, 1 Oct 2009 16:54:02 +0000 (00:54 +0800)]
wpa_supplicant: check if ca_cert is null.
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.
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.
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>
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.
Chia-chi Yeh [Fri, 18 Sep 2009 09:35:06 +0000 (17:35 +0800)]
wpa_supplicant: switch to multi-user keystore.
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:02 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:05 +0000 (14:13 -0700)]
merge from donut
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.
Kenny Root [Wed, 26 Aug 2009 06:47:07 +0000 (01:47 -0500)]
cherry-pick: wpa_supplicant: disable OpenSSL engine.
Change-Id: I53c8381a743b4c97857d61af813d7e408e2e5ea8
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.
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:32:11 +0000 (08:32 -0700)]
merge from open-source master
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.
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
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>
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>
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>
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>
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.
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.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:23 +0000 (09:00 -0700)]
merge from open-source master
Dmitry Shmidt [Thu, 30 Jul 2009 21:16:44 +0000 (14:16 -0700)]
Add rssi-approx call
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:00 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:02 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Chung-yih Wang [Tue, 14 Jul 2009 17:50:46 +0000 (10:50 -0700)]
am
8b41a266: Fix the incorrect conversion detection in PEM format.
Merge commit '
8b41a26668d2f3dfe5a40893eefcdeece0bf7bbd'
* commit '
8b41a26668d2f3dfe5a40893eefcdeece0bf7bbd':
Fix the incorrect conversion detection in PEM format.
Chung-yih Wang [Tue, 14 Jul 2009 08:42:36 +0000 (16:42 +0800)]
Fix the incorrect conversion detection in PEM format.
Since there could be some human readble help text in the PEM header,
we need to refine our type checking to make it correct since tls_openssl
can accept blob with DER format only.
+ The keystore blobs will be cleaned up for each tls connection.
Mike Lockwood [Thu, 9 Jul 2009 01:07:47 +0000 (18:07 -0700)]
am
696bb1ba: Create wpa_supplicant.conf with chmod=660
Merge commit '
696bb1baf94db908e4982d870c14e5d5600ac898'
* commit '
696bb1baf94db908e4982d870c14e5d5600ac898':
Create wpa_supplicant.conf with chmod=660
Mike Lockwood [Wed, 8 Jul 2009 23:01:02 +0000 (19:01 -0400)]
Create wpa_supplicant.conf with chmod=660
This is necessary for allowing the backup service to backup and restore wpa_supplicant.conf.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chung-yih Wang [Tue, 7 Jul 2009 11:25:19 +0000 (04:25 -0700)]
am
18785c24: Read the certificate/private key from keystore.
Merge commit '
18785c24ead65359425e2d5ce80d74dc7cdae8f7'
* commit '
18785c24ead65359425e2d5ce80d74dc7cdae8f7':
Read the certificate/private key from keystore.
Chung-yih Wang [Thu, 2 Jul 2009 16:06:33 +0000 (00:06 +0800)]
Read the certificate/private key from keystore.
Reimplement the retrievel of the cert/key data from keystore
and use "blob://" to indicate the data is a blob, this will
save us to touch the certificate handling part in tls_openssl.c.
However, since the original cert handling is not complete for
dealing with blob data. We have to convert the blob data to DER
format if it is a PEM one.
Dmitry Shmidt [Thu, 25 Jun 2009 20:19:30 +0000 (13:19 -0700)]
Add link speed support
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Mon, 22 Jun 2009 22:45:09 +0000 (15:45 -0700)]
Fix possible scan conflict if two scan commands are issued at same time
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
San Mehat [Mon, 22 Jun 2009 16:56:49 +0000 (09:56 -0700)]
am
c0625dbf: wpa_supplicant: Connect wpa_printf() -> android logging framework so we can log output messages from wpa_supplicant.
Merge commit '
c0625dbf8612371a777585c8d74eb21f25dcf70f'
* commit '
c0625dbf8612371a777585c8d74eb21f25dcf70f':
wpa_supplicant: Connect wpa_printf() -> android logging framework so we can
Dmitry Shmidt [Wed, 17 Jun 2009 22:31:20 +0000 (15:31 -0700)]
Adjust scan requests with Android Setting activity
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
San Mehat [Tue, 16 Jun 2009 23:23:11 +0000 (16:23 -0700)]
wpa_supplicant: Connect wpa_printf() -> android logging framework so we can
log output messages from wpa_supplicant.
Signed-off-by: San Mehat <san@google.com>
Dmitry Shmidt [Thu, 11 Jun 2009 22:23:45 +0000 (15:23 -0700)]
Add driver_cmd processing
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 10 Jun 2009 21:53:57 +0000 (14:53 -0700)]
Fix SIOCSIWMODE ioctl processing
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Mike Lockwood [Tue, 9 Jun 2009 11:44:41 +0000 (07:44 -0400)]
Add capabilities CAP_NET_ADMIN and CAP_NET_RAW and switch to wifi user at startup.
This allows wpa_supplicant to use wireless extensions when running as non-root.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dmitry Shmidt [Thu, 4 Jun 2009 18:21:41 +0000 (11:21 -0700)]
Add 200 ms delay after setting interface UP
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 14 May 2009 20:51:34 +0000 (13:51 -0700)]
Fix compilation warning
Dmitry Shmidt [Wed, 13 May 2009 19:07:19 +0000 (12:07 -0700)]
Switch to wireless_copy.h rev 22
San Mehat [Wed, 6 May 2009 22:02:25 +0000 (15:02 -0700)]
am
68f5944: wpa_supplicant: impliment wpa_ctrl_get_fd()
Merge commit '
68f5944178ec1bc2c5a3ff2d23fc4d08bf354798'
* commit '
68f5944178ec1bc2c5a3ff2d23fc4d08bf354798':
wpa_supplicant: impliment wpa_ctrl_get_fd()
San Mehat [Wed, 6 May 2009 18:22:41 +0000 (11:22 -0700)]
wpa_supplicant: impliment wpa_ctrl_get_fd()
Signed-off-by: San Mehat <san@google.com>
Dmitry Shmidt [Wed, 6 May 2009 15:50:56 +0000 (08:50 -0700)]
Use libc's if_nametoindex() fucntion
Dmitry Shmidt [Tue, 5 May 2009 17:43:52 +0000 (10:43 -0700)]
Add option to use private API library
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:16 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:31 +0000 (17:12 -0700)]
Merge donut into master
Dmitry Shmidt [Mon, 20 Apr 2009 16:54:13 +0000 (09:54 -0700)]
Merge branch 'readonly-p4-master'
Dmitry Shmidt [Mon, 20 Apr 2009 16:52:56 +0000 (09:52 -0700)]
AI 146935: am: CL 146934 Make TI Wifi driver choice framework-independent - part 1
Original author: dimitrysh
Automated import of CL 146935
Dmitry Shmidt [Mon, 20 Apr 2009 16:48:54 +0000 (09:48 -0700)]
AI 146934: Make TI Wifi driver choice framework-independent - part 1
BUG=
1786365
Automated import of CL 146934
Dmitry Shmidt [Thu, 16 Apr 2009 18:40:10 +0000 (11:40 -0700)]
Merge branch 'readonly-p4-master'
Dmitry Shmidt [Thu, 16 Apr 2009 18:38:56 +0000 (11:38 -0700)]
AI 146505: am: CL 146027 Update wpa_supplicant from 0.5.10 to 0.5.11
Original author: dimitrysh
Automated import of CL 146505
Dmitry Shmidt [Tue, 14 Apr 2009 01:43:17 +0000 (18:43 -0700)]
AI 146027: Update wpa_supplicant from 0.5.10 to 0.5.11
BUG=
1786358
Automated import of CL 146027
The Android Open Source Project [Sun, 29 Mar 2009 15:55:09 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
Mike Lockwood [Sat, 28 Mar 2009 02:01:43 +0000 (19:01 -0700)]
AI 143349: am: CL 143198 am: CL 142968 Remove showlease, wpa_cli and radiooptions tools from user builds.
Should save us 52K in /system
BUG=
1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143349
Mike Lockwood [Sat, 28 Mar 2009 00:32:57 +0000 (17:32 -0700)]
AI 143198: am: CL 142968 Remove showlease, wpa_cli and radiooptions tools from user builds.
Should save us 52K in /system
BUG=
1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Automated import of CL 143198
The Android Open Source Project [Fri, 27 Mar 2009 22:31:06 +0000 (15:31 -0700)]
Merge commit 'korg/cupcake'
Mike Lockwood [Thu, 26 Mar 2009 19:50:54 +0000 (12:50 -0700)]
Automated import from //branches/cupcake/...@142968,142968
Jean-Baptiste Queru [Wed, 18 Mar 2009 00:37:29 +0000 (17:37 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
The Android Open Source Project [Mon, 9 Mar 2009 18:52:12 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Wed, 4 Mar 2009 03:31:34 +0000 (19:31 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:44 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 10 Feb 2009 23:44:00 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 18 Dec 2008 02:05:30 +0000 (18:05 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution
Upstream [Mon, 12 Jan 1970 13:46:40 +0000 (13:46 +0000)]
external/wpa_supplicant 0.5.10