commit | 70e8de15df8617125328c5fcaa86af8ce9e44dfa | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Tue Mar 24 03:25:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 24 03:25:43 2015 +0000 |
tree | d3f03d4faee1c1bdc69dd4bbcda0fa50921f7e1f | |
parent | 2fd936aedb28539354aa75d01e17af7b98afdf68 [diff] | |
parent | 0d5fd3fc54895cd74a24ca53b7c871bc6d47794c [diff] |
am 0d5fd3fc: am aab6d576: Revert "ECIES: add HKDF (specified in RFC 5869) using HMAC-SHA256" * commit '0d5fd3fc54895cd74a24ca53b7c871bc6d47794c': Revert "ECIES: add HKDF (specified in RFC 5869) using HMAC-SHA256"