summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0HEADreplicant-6.0-0003replicant-6.0Wolfgang Wiedmeyer2017-12-109-95/+178
|\
| * DO NOT MERGEDavid Benjamin2017-07-172-22/+20
| * DO NOT MERGEDavid Benjamin2017-07-176-55/+44
| * DO NOT MERGEAdam Langley2017-07-173-17/+113
| * DO NOT MERGEAdam Langley2017-07-172-16/+16
* | Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0replicant-6.0-0002Wolfgang Wiedmeyer2017-09-081-16/+31
|\ \ | |/
| * CVE 2016-2109 fixAdam Vartanian2017-07-061-16/+31
* | Merge branch 'cm-13.0' of https://github.com/LineageOS/android_external_borin...replicant-6.0-0001Wolfgang Wiedmeyer2017-05-022-58/+100
|\ \ | |/
| * Rewrite BN_bn2dec.David Benjamin2017-03-222-58/+100
* | crypto/bio: define _POSIX_C_SOURCE in socket helperWolfgang Wiedmeyer2016-12-091-1/+2
|/
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-094-3/+35
|\
| * Re-add |EVP_des_ede_cbc|.Matt Braithwaite2016-09-274-2/+34
| * Fix NID of |EVP_CIPHER des3_cbc|.Matt Braithwaite2016-09-271-1/+1
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+3
|\ \ | |/
| * Fix encoding bug in i2c_ASN1_INTEGERAdam Langley2016-05-271-1/+3
* | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-53/+7
|\ \ | |/
| * Remove support for mis-encoded PKCS#8 DSA keys.David Benjamin2016-03-261-53/+7
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ex...Steve Kondik2016-03-110-0/+0
|\ \
| * \ keep history after reset to mnc-dr-devBaligh Uddin2016-01-250-0/+0
| |\ \ | | |/ | |/|
| | * DO NOT MERGE ANYWHERE Revert "Whitelist windows modules"Kenny Root2015-10-032-15/+13
| | * Merge mnc-dr-dev-plus-aosp into mnc-ub-devKenny Root2015-10-02455-26593/+23504
| | |\
| | | * am 3df15298: am 184bc934: BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | |\
| | | | * am 184bc934: BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | | |\
| | | | | * BoringSSL: always build with symbol visibility flags.Adam Langley2015-09-251-6/+6
| | | * | | am d947d006: am b8494591: Revert "Revert "external/boringssl: sync with upstr...Kenny Root2015-09-25450-26575/+23106
| | | |\ \ \ | | | | |/ /
| | | | * | am b8494591: Revert "Revert "external/boringssl: sync with upstream.""Kenny Root2015-09-25450-26575/+23106
| | | | |\ \ | | | | | |/
| | | | | * Revert "Revert "external/boringssl: sync with upstream.""Kenny Root2015-09-25450-26575/+23106
| | | * | | am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | |\ \ \ | | | | |/ /
| | | | * | am a04d78d3: Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | | |\ \ | | | | | |/
| | | | | * Revert "external/boringssl: sync with upstream."Kenny Root2015-09-25450-23106/+26575
| | | * | | am 3781a606: am 1e4884f6: external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | |\ \ \ | | | | |/ /
| | | | * | am 1e4884f6: external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | | |\ \ | | | | | |/
| | | | | * external/boringssl: sync with upstream.Adam Langley2015-09-24450-26575/+23106
| | | * | | am 4ca36931: am 08656b61: Whitelist windows modulesDan Willemsen2015-09-032-13/+15
| | | |\ \ \ | | | | |/ /
| | | | * | am 08656b61: Whitelist windows modulesDan Willemsen2015-09-032-13/+15
| | | | |\ \ | | | | | |/
| | | | | * Whitelist windows modulesDan Willemsen2015-08-282-13/+15
| | | * | | am 929d45bb: (-s ours) am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-270-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-151-12/+2
| | | | |\ \ | | | | | |/
| | | * | | am 5100c0f3: (-s ours) am 13204c36: Disable clang build temporarily to fix bu...Dan Albert2015-08-270-0/+0
| | | |\ \ \ | | | | |/ /
| | | | * | am 13204c36: Disable clang build temporarily to fix build.Dan Albert2015-08-151-6/+8
| | | | |\ \
| | | * | \ \ am 3b2c6065: (-s ours) am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5...Kenny Root2015-08-270-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | | |\ \ \
| | | * | \ \ \ am e25abed5: Fix and re-enable clang build.Dan Albert2015-08-151-12/+2
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fix and re-enable clang build.Dan Albert2015-08-151-12/+2
| | | | | |_|/ | | | | |/| |
| | | * | | | am 13204c36: Disable clang build temporarily to fix build.Dan Albert2015-08-151-6/+8
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Disable clang build temporarily to fix build.Dan Albert2015-08-151-6/+8
| | | | | |/ | | | | |/|
| | | * | | am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/|
| | | | * Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533Kenny Root2015-07-2420-433/+802
| | | | |\
| | | | | * Handle RDRAND failures.Adam Langley2015-06-237-20/+200
| | | | | * dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key.Adam Langley2015-06-231-3/+19