| commit | 2137c849a00c98130d9ac6ca5b9572bc66b56c5e | [log] [tgz] |
|---|---|---|
| author | Ken Sumrall <ksumrall@android.com> | Wed Jan 19 03:48:12 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 19 03:48:12 2011 -0800 |
| tree | 19a888075b69a69ece6b1c4ce43904ac36ba9733 | |
| parent | e11337370855cb21d77537ee8281a0e9d151eb7c [diff] | |
| parent | e87440703663f5ee326326f6438f3b00ea315623 [diff] |
am e8744070: Create and use a salt when calling pbkdf2 to encrypt/decrypt the master key. * commit 'e87440703663f5ee326326f6438f3b00ea315623': Create and use a salt when calling pbkdf2 to encrypt/decrypt the master key.