aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-12-14Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3...android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingandroid-build-team Robot
2017-12-14Allow parsing RSA keys from buffers with extra space at the end.Adam Vartanian
2017-07-12release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4...android-cts-8.1_r2android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r8android-8.1.0_r7android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r22android-8.1.0_r21android-8.1.0_r2android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13android-8.1.0_r1oreo-m5-releaseoreo-m3-releaseandroid-build-team Robot
2017-07-11Merge upstream master am: 5ad04c656a am: 0dc7f2d308 am: d23b35b3a7oreo-mr1-devAdam Vartanian
2017-07-11Merge upstream master am: 5ad04c656a am: 0dc7f2d308Adam Vartanian
2017-07-11Merge upstream master am: 5ad04c656aAdam Vartanian
2017-07-11Merge upstream masterAdam Vartanian
2017-07-06Merge upstream masterandroid-o-preview-4Adam Vartanian
2017-07-05Always use state in ConscryptEngine.is{In,Out}boundClosed() (#242)Adam Vartanian
2017-07-05Expanding benchmarks. (#239)Nathan Mittler
2017-07-05Remove Java <-> OpenSSL name mapping. (#227)David Benjamin
2017-07-05Trim constants and remove unsupported key types. (#230)David Benjamin
2017-07-05Fix inconsistency with engine socket (#238)Nathan Mittler
2017-07-05Call free() if a new socket is immediately closed. (#241)Adam Vartanian
2017-07-03Revert "Merge upstream master". DO NOT MERGE ANYWHERE. am: 50eeb4f6fd -s oursTobias Thierer
2017-07-03Revert "Merge upstream master". DO NOT MERGE ANYWHERE.Tobias Thierer
2017-07-03Implement AlgorithmParameters.GCM in Conscrypt. (#217)Adam Vartanian
2017-06-30Some parsing and serializing fixes. (#219)David Benjamin
2017-06-30Remove remnants of broken SSL_renegotiate tests. (#229)David Benjamin
2017-06-30Make the BufferAllocator public. (#237)Nathan Mittler
2017-06-30Use buffer allocator in engine (#236)Nathan Mittler
2017-06-29Introducing buffer allocation API. (#235)Nathan Mittler
2017-06-29fixing typos (#234)Tiago Morais Morgado
2017-06-29Clean up temporary BoringSSL #ifdefs. (#232)David Benjamin
2017-06-29Refactoring benchmarks. (#233)Nathan Mittler
2017-06-27Add null check in RSA cipher engine (#134)Stojan Dimitrovski
2017-06-26Revert "Merge upstream master". DO NOT MERGE ANYWHERE.oreo-dr1-devTobias Thierer
2017-06-23Remove dead P-192 codepath.David Benjamin
2017-06-23Partial regression fix.Nathan Mittler
2017-06-23Update to the new cmakeKenny Root
2017-06-22Only allow the use of the proper key in RSA with OAEP. (#222)Adam Vartanian
2017-06-21Add availability checks (#216)Nathan Mittler
2017-06-21Revert "Merge upstream master". DO NOT MERGE ANYWHERE. am: 000ce05d40 -s oursTobias Thierer
2017-06-21Revert "Merge upstream master". DO NOT MERGE ANYWHERE.Tobias Thierer
2017-06-20Fixing disposed module error in IntelliJ (#215)Nathan Mittler
2017-06-20Misc cleanup (#214)Nathan Mittler
2017-06-20Revert "Merge upstream master". DO NOT MERGE ANYWHERE.Tobias Thierer
2017-06-20Change so pointer is logged instead of long. (#213)Adam Vartanian
2017-06-20Implement DESEDE SecretKeyFactory for Conscrypt. (#208)Adam Vartanian
2017-06-20Enable new Conscrypt algorithms. (#209)Adam Vartanian
2017-06-19Refactoring session management (#172)Nathan Mittler
2017-06-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4...android-build-team Robot
2017-06-16Various build fixes from 1.0.0.RC8 release (#210)Nathan Mittler
2017-06-15Enable new Conscrypt algorithms. am: bd086d9c07 am: 5ec730a811 am: c0a5538475Adam Vartanian
2017-06-15Enable new Conscrypt algorithms. am: bd086d9c07 am: 5ec730a811Adam Vartanian
2017-06-15Enable new Conscrypt algorithms. am: bd086d9c07Adam Vartanian
2017-06-15Enable new Conscrypt algorithms.Adam Vartanian
2017-06-15release-request-f7cf88d3-9ff3-4602-981e-79c555d8aa91-for-git_oc-mr1-release-4...android-build-team Robot
2017-06-14Fix FD-based socket bug during interruptKenny Root
2017-06-14Move closer to the old test versionKenny Root