summaryrefslogtreecommitdiffstats
path: root/src/crypto/cipher/e_des.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-3/+24
|\ | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: I74fadbfb9c05b2e1ce69f27809add70a2c89ec15
| * Re-add |EVP_des_ede_cbc|.Matt Braithwaite2016-09-271-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that while |DES_ede2_cbc_encrypt| exists, I didn't use it: I think it's easier to see what's happening this way. (I couldn't find an authoritative source of test data, including in OpenSSL's source, so I used OpenSSL's implementation to produce the test ciphertext.) This benefits globalplatform. (cherry picked from commit 8c413a2d94fa720fae6a7d9c939e33978f3ed25b) Bug: 31081987 Change-Id: I7e17ca0b69067d7b3f4bc213b4616eb269882ae0 Reviewed-on: https://boringssl-review.googlesource.com/5724 Reviewed-by: Adam Langley <agl@google.com> (cherry picked from commit 9f12ca8242e6de532a8c947804d9dcf047c45af8)
| * Fix NID of |EVP_CIPHER des3_cbc|.Matt Braithwaite2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6bfdc63114d7921037f44e7e3145c706b9ffb2e4) Bug: 31081987 Change-Id: I0f27fa1897d2f0a148203610ccd5c6c7967f9f3d Reviewed-on: https://boringssl-review.googlesource.com/5510 Reviewed-by: Adam Langley <agl@google.com> (cherry picked from commit 15706c2705f748c4e70fa8f9204a1e2cdf5181d0)
* | Add |EVP_des_ecb| from OpenSSL at fd682e4c.Matt Braithwaite2016-02-151-0/+24
|/ | | | | | | | | | |DES_ecb_encrypt| was already present. This benefits globalplatform. Change-Id: I2ab41eb1936b3026439b5981fb27e29a12672b66 Reviewed-on: https://boringssl-review.googlesource.com/5723 Reviewed-by: Adam Langley <agl@google.com>
* external/boringssl: bump revision.Adam Langley2015-05-121-26/+4
| | | | | | This change bumps the BoringSSL revision to the current tip-of-tree. Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa
* Initial commit of BoringSSL for Android.Adam Langley2015-01-301-0/+157
generated by cgit v1.1 at 2024-05-23 11:15:54 +0000