aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-10am d0bdb529: Merge "Upgrade to 1.0.1j"Kenny Root
2014-11-10Merge "Upgrade to 1.0.1j"Kenny Root
2014-11-07Upgrade to 1.0.1jKenny Root
2014-11-05am 5f4a0c68: am 42c1c473: Merge "trusty: openssl: disable couple warnings for...Kenny Root
2014-11-05am 42c1c473: Merge "trusty: openssl: disable couple warnings for Trusty build"Kenny Root
2014-11-05Merge "trusty: openssl: disable couple warnings for Trusty build"Kenny Root
2014-11-04trusty: openssl: disable couple warnings for Trusty buildMichael Ryleev
2014-11-01am f8195e11: Fix ECDHE-PSK premaster secret derivation.David Benjamin
2014-10-31Fix ECDHE-PSK premaster secret derivation.David Benjamin
2014-10-31am 45b7635d: am ed6913e2: Merge "Fix ECDHE-PSK premaster secret derivation."Alex Klyubin
2014-10-31am ed6913e2: Merge "Fix ECDHE-PSK premaster secret derivation."Alex Klyubin
2014-10-31Merge "Fix ECDHE-PSK premaster secret derivation."Alex Klyubin
2014-10-31am b6fcc559: am c1e586dc: Merge "Follow-up to -no-integrated-as change"Kenny Root
2014-10-31am c1e586dc: Merge "Follow-up to -no-integrated-as change"Kenny Root
2014-10-31Merge "Follow-up to -no-integrated-as change"Kenny Root
2014-10-30Follow-up to -no-integrated-as changeKenny Root
2014-10-30Fix ECDHE-PSK premaster secret derivation.David Benjamin
2014-10-29am 12f2cb24: am 54efc188: Merge "Add support for TLS_FALLBACK_SCSV"Neil Fuller
2014-10-26am 080035f3: am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved con...Neil Fuller
2014-10-26am 393dad22: am cee54034: am aad21bb5: (-s ours) resolved conflicts for merge...Neil Fuller
2014-10-26am 7f20405f: am 8389210d: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh
2014-10-26am 97520c86: am 9a68a8fb: Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-26am b76660f8: am fe7f7eab: Merge "Add flavor.mk to indicate that this is OpenS...Kenny Root
2014-10-24am 54efc188: Merge "Add support for TLS_FALLBACK_SCSV"Neil Fuller
2014-10-23Merge "Add support for TLS_FALLBACK_SCSV"Neil Fuller
2014-10-23Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-10am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for me...Neil Fuller
2014-10-10am cee54034: am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b ...Neil Fuller
2014-10-10am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for me...Neil Fuller
2014-10-10am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c639...android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-devlollipop-cts-releaseNeil Fuller
2014-10-10am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-...Neil Fuller
2014-10-10am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aospNeil Fuller
2014-10-10resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aospNeil Fuller
2014-10-09am cee54034: am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b ...Neil Fuller
2014-10-09am aad21bb5: (-s ours) resolved conflicts for merge of 4068658b to klp-modula...Neil Fuller
2014-10-09resolved conflicts for merge of 4068658b to klp-modular-devNeil Fuller
2014-10-08Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-08am 8389210d: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh
2014-10-08am 8389210d: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh
2014-10-08Merge "Add -no-integrated-as at local level."android-l-preview_r2l-previewChih-Hung Hsieh
2014-10-08Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-07Add -no-integrated-as at local level.Chih-Hung Hsieh
2014-10-07am 9a68a8fb: Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-06am 9a68a8fb: Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-10-03Add support for TLS_FALLBACK_SCSVBodo Moeller
2014-09-26am fe7f7eab: Merge "Add flavor.mk to indicate that this is OpenSSL."Kenny Root
2014-09-26am fe7f7eab: Merge "Add flavor.mk to indicate that this is OpenSSL."Kenny Root
2014-09-26Merge "Add flavor.mk to indicate that this is OpenSSL."Kenny Root
2014-09-25Add flavor.mk to indicate that this is OpenSSL.Adam Langley
2014-08-06am 8e8ec665: Retry sending record split fragment when SSL write failsKenny Root