diff options
| author | Ganesh Ganapathi Batta <ganeshg@broadcom.com> | 2014-04-16 16:50:09 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2014-05-06 01:14:25 -0700 |
| commit | 7fa4fba6f59f97df00aff07dbe8fb21b114b3c2c (patch) | |
| tree | 2f1168601e9861a9277b65464a20cd9294279d16 /stack/smp/aes.c | |
| parent | 3b8b972a8151c081905f3c1273e5d6cdd3401354 (diff) | |
| download | android_system_bt-7fa4fba6f59f97df00aff07dbe8fb21b114b3c2c.tar.gz android_system_bt-7fa4fba6f59f97df00aff07dbe8fb21b114b3c2c.tar.bz2 android_system_bt-7fa4fba6f59f97df00aff07dbe8fb21b114b3c2c.zip | |
Merge BT 4.1 features
The features include:
- LE Peripheral Mode
- Link Layer topology (LE Central & Peripheral Concurrency)
- Dual Mode Topology (Ability to choose LE transport when connecting with
other Dual Mode devices)
- Fast advertising Interval
- Limited Discovery Time Changes
- GAP Authentication and Lost Bond
- Dual Mode Addressing
- Common Profile and Service Error Code
- 32 bit UUIDs
Change-Id: Ic6701da4cf6aaa390ff2c8816b43157f36b7fb42
Conflicts:
stack/btu/btu_hcif.c
Diffstat (limited to 'stack/smp/aes.c')
| -rw-r--r-- | stack/smp/aes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stack/smp/aes.c b/stack/smp/aes.c index 65cddf5bb..d3d8ff610 100644 --- a/stack/smp/aes.c +++ b/stack/smp/aes.c @@ -510,6 +510,7 @@ return_type aes_set_key( const unsigned char key[], length_type keylen, aes_cont keylen = 24; break; case 32: + /* case 256: length in bits (256 = 8*32) */ keylen = 32; break; default: |