tree e8ef0a6cb21ae284fba1a4b3b235b391f3fb6547
parent f8151ead9dfab27164c6e583ec4475b007088f3d
parent 0597b069de5e8ca2dacffa09537add20f6d28560
author Chad Brubaker <cbrubaker@google.com> 1427492515 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427492515 +0000

am 0597b069: Merge "ECIES: fix memory leaks and add malloc checks in HKDF. Use fixed-timing memcmp in HmacOperation."

* commit '0597b069de5e8ca2dacffa09537add20f6d28560':
  ECIES: fix memory leaks and add malloc checks in HKDF. Use fixed-timing memcmp in HmacOperation.