summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1Dan Pasanen2016-12-056-0/+39
|\
| * DO NOT MERGE: Add a few more no-op stubs for cURL compatibility. am: 4177c9b481David Benjamin2016-10-186-0/+39
| |\
| | * DO NOT MERGE: Add a few more no-op stubs for cURL compatibility.David Benjamin2016-10-186-0/+39
| | |\
| | | * DO NOT MERGE: Add a few more no-op stubs for cURL compatibility.David Benjamin2016-10-066-0/+39
| * | | Re-add |EVP_des_ede_cbc|. am: 9f12ca8242 am: cbbf882c58 am: cc069eaff4 am: c1...Matt Braithwaite2016-09-150-0/+0
| |\ \ \ | | |/ /
| | * | Re-add |EVP_des_ede_cbc|. am: 9f12ca8242 am: cbbf882c58 am: cc069eaff4 am: c1...Matt Braithwaite2016-09-150-0/+0
| | |\ \ | | | |/
| | | * Re-add |EVP_des_ede_cbc|. am: 9f12ca8242 am: cbbf882c58 am: cc069eaff4Matt Braithwaite2016-09-150-0/+0
| | | |\
| | | | * Re-add |EVP_des_ede_cbc|. am: 9f12ca8242 am: cbbf882c58Matt Braithwaite2016-09-154-2/+34
| | | | |\
| | | | | * Re-add |EVP_des_ede_cbc|. am: 9f12ca8242Matt Braithwaite2016-09-154-2/+34
| | | | | |\
| | | | | | * Re-add |EVP_des_ede_cbc|.Matt Braithwaite2016-09-154-2/+34
| | | | | | |\
| | | | | | | * Re-add |EVP_des_ede_cbc|.Matt Braithwaite2016-09-144-2/+34
| * | | | | | | Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705 am: cb576493fe am: b6d97eefe...Matt Braithwaite2016-09-150-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705 am: cb576493fe am: b6d97eefe...Matt Braithwaite2016-09-150-0/+0
| | |\ \ \ \ \ \ | |/ / / / / / / | | | _ / / / / | | | / / / /
| | * | | | | Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705 am: cb576493fe am: b6d97eefe4Matt Braithwaite2016-09-150-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705 am: cb576493feMatt Braithwaite2016-09-151-1/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix NID of |EVP_CIPHER des3_cbc|. am: 15706c2705Matt Braithwaite2016-09-151-1/+1
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix NID of |EVP_CIPHER des3_cbc|.Matt Braithwaite2016-09-151-1/+1
| | | | | |\ \ | | | | | | |/
| | | | | | * Fix NID of |EVP_CIPHER des3_cbc|.Matt Braithwaite2016-09-141-1/+1
| * | | | | | Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6 am: 78f200490e am: 5f5107...Adam Langley2016-05-250-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6 am: 78f200490e am: 5f5107...Adam Langley2016-05-250-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6 am: 78f200490eAdam Langley2016-05-251-1/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6Adam Langley2016-05-251-1/+3
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix encoding bug in i2c_ASN1_INTEGERAdam Langley2016-05-251-1/+3
| | | | | |\ \ | | | | |/ / / | | | | | | _
| | | | | * Fix encoding bug in i2c_ASN1_INTEGERAdam Langley2016-02-291-1/+3
| | | | |/
* | | | | Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/ext...Steve Kondik2016-10-250-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Fix encoding bug in i2c_ASN1_INTEGERAdam Langley2016-05-161-1/+3
| |\ \ \ \ | | |/ / /
* | | | | boringssl: Build decrepit source into libcrypto.cm-14.0Adnan Begovic2016-08-242-0/+6
| |/ / / |/| | |
* | | | Fix encoding bug in i2c_ASN1_INTEGERAdam Langley2016-05-131-1/+3
|/ / /
* | | Remove support for mis-encoded PKCS#8 DSA keys. am: c042e7eDavid Benjamin2016-03-211-53/+7
|\ \ \ | |/ /
| * | Remove support for mis-encoded PKCS#8 DSA keys.David Benjamin2016-03-211-53/+7
| |\ \ | | |/
| | * Remove support for mis-encoded PKCS#8 DSA keys.David Benjamin2016-03-151-53/+7
* | | keep history after reset to mnc-dr-dev am: 23df918209 -s oursBaligh Uddin2016-01-260-0/+0
|\ \ \
| * \ \ keep history after reset to mnc-dr-devBaligh Uddin2016-01-260-0/+0
| |\ \ \ | | |/ /
| | * | keep history after reset to mnc-dr-devBaligh Uddin2016-01-250-0/+0
| | |\ \ | | | |/ | | |/|
* | | | Merge "Revert "Use libmingwex for gmtime_s""Dan Albert2016-01-251-6/+0
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Use libmingwex for gmtime_s""Dan Albert2016-01-251-6/+0
| |\ \ \
| | * | | Revert "Use libmingwex for gmtime_s"Dan Albert2016-01-151-6/+0
* | | | | external/boringssl: sync to 7b8b9c17Adam Langley2016-01-15246-14256/+44966
|\ \ \ \ \ | |/ / / /
| * | | | external/boringssl: sync to 7b8b9c17Adam Langley2016-01-14246-14256/+44966
| |/ / /
* | | | Do not sanitize host static libraries.Alex Klyubin2015-12-111-0/+12
|\ \ \ \ | |/ / /
| * | | Do not sanitize host static libraries.Alex Klyubin2015-12-111-0/+12
* | | | Revert "Revert "Opt-out of STL""Kenny Root2015-12-041-0/+6
|\ \ \ \ | |/ / /
| * | | Revert "Revert "Opt-out of STL""Kenny Root2015-12-041-0/+6
* | | | Revert "Opt-out of STL"Kenny Root2015-12-041-4/+0
|\ \ \ \ | |/ / /
| * | | Revert "Opt-out of STL"Kenny Root2015-12-041-4/+0
* | | | Opt-out of STLColin Cross2015-12-041-0/+4
|\ \ \ \ | |/ / /
| * | | Opt-out of STLColin Cross2015-12-031-0/+4
* | | | external/boringssl: update from upstreamAdam Langley2015-11-18115-2596/+25043
|\ \ \ \ | |/ / /
| * | | external/boringssl: update from upstreamAdam Langley2015-11-12115-2596/+25043
* | | | Revert "Revert "external/boringssl: sync with upstream.""Kenny Root2015-11-06224-5714/+6970
|\ \ \ \ | |/ / /