summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* libcore: removed unnecessary code in SSLSocketTestSergio Giro2015-06-171-7/+0
* Merge "Do not blacklist serial numbers that are too short" into mnc-devKenny Root2015-06-151-15/+0
|\
| * Do not blacklist serial numbers that are too shortKenny Root2015-06-151-15/+0
* | Merge "Fix X509CertificateTest#test_Provider." into mnc-devAlex Klyubin2015-06-151-0/+7
|\ \
| * | Fix X509CertificateTest#test_Provider.Alex Klyubin2015-06-151-0/+7
| |/
* | Fix CertificateTest#testVerifyPublicKeyString2Narayan Kamath2015-06-151-8/+7
|/
* Merge "Mark deprecated ciphers visually" into mnc-devKenny Root2015-06-122-146/+162
|\
| * Mark deprecated ciphers visuallyKenny Root2015-06-122-146/+162
* | Merge "Send SIGQUIT when finalizer times out" into mnc-devMathieu Chartier2015-06-111-0/+10
|\ \
| * | Send SIGQUIT when finalizer times outMathieu Chartier2015-06-111-0/+10
* | | Merge "Fix lookup order when opening directly from APK" into mnc-devDmitriy Ivanov2015-06-113-99/+126
|\ \ \
| * | | Fix lookup order when opening directly from APKDmitriy Ivanov2015-06-113-99/+126
* | | | libcore: add tests to check behaviour for padding and decrypt modeSergio Giro2015-06-111-9/+60
* | | | Merge "SSLEngineTest: set up server instead of using anon" into mnc-devKenny Root2015-06-101-14/+7
|\ \ \ \
| * | | | SSLEngineTest: set up server instead of using anonKenny Root2015-06-101-14/+7
* | | | | Merge "SSLSocketTest: add test with no ciphers" into mnc-devKenny Root2015-06-101-0/+31
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | SSLSocketTest: add test with no ciphersKenny Root2015-06-101-0/+31
| |/ /
* | | Merge "Fix X509CertificateTest.testVerifyPublicKeyString failure." into mnc-devAlex Klyubin2015-06-101-6/+7
|\ \ \
| * | | Fix X509CertificateTest.testVerifyPublicKeyString failure.Alex Klyubin2015-06-101-6/+7
| |/ /
* | | Merge "Explicitly set DateFormat.is24Hour value needed by tests" into mnc-devNeil Fuller2015-06-104-9/+26
|\ \ \
| * | | Explicitly set DateFormat.is24Hour value needed by testsNeil Fuller2015-06-104-9/+26
* | | | Relax the test for inappropriate fallbackKenny Root2015-06-091-4/+7
| |/ / |/| |
* | | Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct...Hudson Mdm2015-06-091-57/+0
|\ \ \
| * \ \ Merge "Update CA certificates" into mnc-devKenny Root2015-06-091-57/+0
| |\ \ \
| | * | | Update CA certificatesKenny Root2015-06-091-57/+0
* | | | | am bb1ac7e9: am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connect...Daniel Xie2015-06-090-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connectLjava_net_Soc...Daniel Xie2015-06-080-0/+0
| |\ \ \ \
| | * \ \ \ am 7329657b: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ...Daniel Xie2015-06-081-0/+12
| | |\ \ \ \
| | | * \ \ \ Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-081-0/+12
| | | |\ \ \ \
| | | | * \ \ \ Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-041-0/+12
| | | | |\ \ \ \
| | | | | * | | | Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2015-06-041-0/+12
| | | | |/ / / /
* | | | | | | | Skip AndroidKeyStore provider in ECDHKeyAgreementTest.Alex Klyubin2015-06-091-4/+19
| |_|_|_|/ / / |/| | | | | |
* | | | | | | libcore: throw InvalidKeyException instead of ProviderExceptionSergio Giro2015-06-099-56/+375
* | | | | | | Update CA certificatesKenny Root2015-06-0819-861/+890
| |_|_|_|/ / |/| | | | |
* | | | | | am 3039ab33: am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved con...Kenny Root2015-06-060-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for me...Kenny Root2015-06-040-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b189...Kenny Root2015-06-040-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-mod...Kenny Root2015-06-020-0/+0
| | | |\ \ \
| | | | * \ \ am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-020-0/+0
| | | | |\ \ \
| | | | | * \ \ resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-010-0/+0
| | | | | |\ \ \
| | | | | | * | | OpenSSLX509Certificate: mark mContext as transientKenny Root2015-05-293-1/+113
* | | | | | | | | Merge "Add VMRuntime.runFinalizationWithTimeout" into mnc-devMathieu Chartier2015-06-053-11/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add VMRuntime.runFinalizationWithTimeoutMathieu Chartier2015-06-053-11/+47
* | | | | | | | | | Ignore AndroidKeyStore in SignatureTest.Alex Klyubin2015-06-041-0/+6
|/ / / / / / / / /
* | | | | | | | | No need to test EC keys of 192 bitsKenny Root2015-06-041-4/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge "Update offered ciphers" into mnc-devKenny Root2015-06-043-150/+150
|\ \ \ \ \ \ \ \
| * | | | | | | | Update offered ciphersKenny Root2015-06-043-150/+150
* | | | | | | | | Merge "Replace hyphen with en dash" into mnc-devKenny Root2015-06-042-112/+112
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Replace hyphen with en dashKenny Root2015-06-032-112/+112
* | | | | | | | | am 5d40866c: am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicas...Neil Fuller2015-06-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |