commit | e52da3d27ffc00711f68a8c8065ebd1d2c877392 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Tue Mar 10 17:55:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 10 17:55:57 2015 +0000 |
tree | d12b369ad442b6004280e43e72fcda0c436ea79c | |
parent | fb88659e02fb5a31b0608f45a4e7eca603dc432d [diff] | |
parent | 12105116914f22e71d9fca6dbb429e1d07ea26be [diff] |
am 12105116: Merge changes I2b7ca81b,I8308b23d,I33074bfe * commit '12105116914f22e71d9fca6dbb429e1d07ea26be': Add rileyspahn@'s keymaster enforcement code. Implement AddRngEntropy. Add AAD support to AES OCB.