android-7.1.0_r7 - platform/external/conscrypt

tag: bdb23352a1cfd8fdd5209791aaa44c7dad744e0f
tagger: The Android Open Source Project <initial-contribution@android.com>
Fri Nov 04 11:14:01 2016 -0700
object: 68a82f6e34082ef20cb7bd366cc0d2170fc33e1a

Android 7.1.0 release 7

commit: 68a82f6e34082ef20cb7bd366cc0d2170fc33e1a
[log]
author: Kenny Root <kroot@google.com>
Thu Aug 25 12:08:18 2016 -0700
committer: gitbuildkicker <android-build@google.com>
Wed Oct 12 17:24:08 2016 -0700
tree: e842361a7e46e239ed82593793f0d1718025af02
parent: 456452b42c559a63aa5ebe575a1d3c816f628e39 [diff]

Fix typo in name of des-ede mapping

This was mapping 2-key 3DES to regular DES thus resulting in all
encryption using 2-key 3DES having the wrong answers.

(cherry picked from commit 55caed999846897bcf949828e6e367bf8d7d9909)

Bug: 31081987
Change-Id: I44ba12dcf51d57952cf3ba501381d144d271a2a6
(cherry picked from commit 3209baf397afb1481aa19d398f34c48facc19903)

src/main/native/org_conscrypt_NativeCrypto.cpp[diff]

1 file changed

tree: e842361a7e46e239ed82593793f0d1718025af02