aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I01e30cb7ff12bb48ea194af0dd5fea7f1b0bf90d
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18d ↵Bob Badour
am: ad0a229d9a am: a44c0f0397 am: 788c0a8d86 am: e848e5ffc6 Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 Change-Id: I617a52a35406511b463c0bcdb3932a43a2213863
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77b26c3be8 -s ↵Xin Li
ours am: 8121f60aec -s ours am: 480c76b27b -s ours am skip reason: Change-Id If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 with SHA-1 9aaad515f8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I45afaddeccfcf67fa8448315b5b3de2a14728fa4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77b26c3be8 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 8121f60aec -s ours am: 480c76b27b -s ours am skip reason: Change-Id If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 with SHA-1 9aaad515f8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I135deb8d1b93d03f7865d052e85e2376897c5b84
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77b26c3be8 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 8121f60aec -s ours am skip reason: Change-Id If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 with SHA-1 9aaad515f8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f24f8038d640ad629c6eb66054345f5249f22b1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77b26c3be8 -s oursXin Li
am skip reason: Change-Id If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 with SHA-1 9aaad515f8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9826051726a9e1d1242d0d2cc55d52e8d0a50036
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5 Change-Id: I93cce73e18e634b28995519b6bdb1b9d19608924
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18d ↵Bob Badour
am: ad0a229d9a am: a44c0f0397 am: 788c0a8d86 Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0f4456456d9304c1064344b4a7ed63936b067a45
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18d ↵Bob Badour
am: ad0a229d9a am: a44c0f0397 am: 788c0a8d86 Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1878914fe4fcf910c23863d1498f871e65d60306
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18d ↵Bob Badour
am: ad0a229d9a am: a44c0f0397 Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I368d5aa1847d3e1e0ade6f9f3685bcc87d2f8fa4
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18d ↵Bob Badour
am: ad0a229d9a Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfe08380c627e862f4d288ab6794f1b9a5569432
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopenssl am: 11c20cd18dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1588518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c0bb8f1cc8c1894a6b343b721fbb7e25d0de755
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/python/pyopensslandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp src/OpenSSL/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie0212b5c649e8e7e05eea24d5b3de8732f8017f1
2021-01-14Remove test mapping file for acloud_test am: 745a2bd34a am: 1000811c6a am: ↵Julien Desprez
118342836f Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1549738 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17e2ce2692e8e338b68b9506703b0e272660eeca
2021-01-14Remove test mapping file for acloud_test am: 745a2bd34a am: 1000811c6aJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1549738 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib40bb73342bcfc74ecd4eb48d13f629187788b8a
2021-01-13Remove test mapping file for acloud_test am: 745a2bd34aJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1549738 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc969a4efaddb8bc50673f15901e90e8ee37b868
2021-01-13Remove test mapping file for acloud_testJulien Desprez
Not needed anymore. Test: presubmit Bug: 175408655 Change-Id: I8aa9fd032b6f23352e0e6ee266e968c29b6ff331
2020-12-16Upgrade python/pyopenssl to 20.0.1 am: 85a0e4a2f1 am: a8bfc97dba am: 9aaad515f8Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1531280 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id48a5ccd69f7eb02985a6fc5f97dc0cee04fee0b
2020-12-16Upgrade python/pyopenssl to 20.0.1 am: 85a0e4a2f1 am: a8bfc97dbaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1531280 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5
2020-12-16Upgrade python/pyopenssl to 20.0.1 am: 85a0e4a2f1Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/pyopenssl/+/1531280 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59a4962b74303aa86ba52ff27cddeb957f31d45b
2020-12-15Upgrade python/pyopenssl to 20.0.1Haibo Huang
Test: make Change-Id: Icdf65bde24f056bd011ee39635e7d66662ef4d4d
2020-12-15Prepare for 20.0.1 release (#979)Alex Gaynor
2020-12-14Fix for running on OpenSSL 1.1.0 + CI (#978)Alex Gaynor
* Test on OpenSSL 1.1.0 w/ Debian stretch * Make pyOpenSSL compatible with openssl 1.1.0 again Co-authored-by: Shane Harvey <shnhrv@gmail.com>
2020-12-14remove py2 w/ cryptography master (#977)Alex Gaynor
* remove py2 w/ cryptography master * Update ci.yml
2020-11-29Tox.ini; Test on Python 3.9 and make flake8 stricter (#966)Christian Clauss
* Tox.ini; Test on Python 3.9 and make flake8 stricter * max-line-length = 88 * Remove unused import * Update tox.ini * Use PEP8 line length * Use PEP8 line length
2020-11-27reopen master for next dev cycle (#969)Paul Kehrer
2020-11-2720.0.0 before 2020 is even over (#968)Paul Kehrer
2020-11-27fix a memleak (#967)Paul Kehrer
* fix a memleak * black
2020-11-27Keep reference to SSL verify_call in Connection object (#956)Arne Schwabe
* Keep reference to SSL verify_call in Connection object If a set_verify is used on a context before and after a Connection the reference in the SSL* object still points to the old _verify_helper object. Since this object has no longer any references to it, the callback can result in a segfault. This commit fixes the issues by ensuring that as long as the Connection object/SSL* object lives a reference to the callback function is held. * Add Unit test for set_verify_callback deference
2020-11-27Remove leakcheck (#965)Alex Gaynor
It's not being run anywhere, and plainly doesn't support py3 so it's clearly not important to anyone.
2020-11-23Added dependabot for GHA (#961)Alex Gaynor
2020-11-17Migrate CI to GHA (#960)Alex Gaynor
2020-11-13Fix spelling of set in set_verify docstring (#959)Arne Schwabe
2020-11-12Stop testing py35 with cryptography master (#958)Alex Gaynor
2020-11-12Fix typo in debug command output (#957)Michael Lazar
Co-authored-by: Michael Lazar <mlazar@doctorondemand.com>
2020-10-26Drop CI for OpenSSL 1.0.2 (#953)Alex Gaynor
* Drop CI for OpenSSL 1.0.2 * Delete code for coverage reasons * Bump minimum cryptography version
2020-10-18Fixing issue #798 (#907)jalberdi004
* Fixing issue #798, thanks to @reaperhulk; removing undocumented '%s' option and getting the date in a more robust way Co-authored-by: Joseba Alberdi <j.alberdi@simuneatomistics.com> Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
2020-10-14Correct typos in crypto.py (#949)Felix Yan
2020-10-14fixed tests for twisted change (#950)Alex Gaynor
* fixed tests for twisted change
2020-10-12crypto._PassphraseHelper: pass non-callable passphrase using callback (#947)Huw Jones
* crypto._PassphraseHelper: pass non-callable passphrase using callback Fixes #945 Before this commit, we would pass a bytes passphrase as a null terminated string. This causes issue when a randomly generated key's first byte is null because OpenSSL rightly determines the key length is 0. This commit modifies the passphrase helper to pass the passphrase via the callback * Update changelog to document bug fix
2020-10-12Allow using additional untrusted certificates for chain building in ↵Sándor Oroszi
X509StoreContext (#948) The additional certificates provided in the new `chain` parameter will be untrusted but may be used to build the chain. This makes it easier to validate a certificate against a store which contains only root ca certificates, and the intermediates come from e.g. the same untrusted source as the certificate to be verified. Co-authored-by: Sandor Oroszi <sandor.oroszi@balabit.com>
2020-09-11Allow using an OpenSSL hashed directory for verification in X509Store (#943)Sándor Oroszi
Add X509Store.load_locations() to set a CA bundle file and/or an OpenSSL- style hashed CA/CRL lookup directory, similar to the already existing SSL.Context.load_verify_locations(). Co-authored-by: Sandor Oroszi <sandor.oroszi@balabit.com>
2020-08-26I'm back in black (#941)Alex Gaynor
2020-08-19travis.com now (#939)Paul Kehrer
2020-08-14lock old issues (#937)Alex Gaynor
2020-08-14fixes #934 -- kill dead link (#936)Alex Gaynor
2020-08-13Switch to new notBefore/After APIs (#843)Rosen Penev
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-08-07Context.set_verify: allow omission of callback (#933)Maximilian Hils
* Context.set_verify: allow omission of callback * squeeze to 80 chars * make it clear that default callback is used
2020-08-05Allow accessing a connection's verfied certificate chain (#894)Shane Harvey
* Allow accessing a connection's verfied certificate chain Add X509StoreContext.get_verified_chain using X509_STORE_CTX_get1_chain. Add Connection.get_verified_chain using SSL_get0_verified_chain if available (ie OpenSSL 1.1+) and X509StoreContext.get_verified_chain otherwise. Fixes #740. * TLSv1_METHOD -> SSLv23_METHOD * Use X509_up_ref instead of X509_dup * Add _openssl_assert where appropriate * SSL_get_peer_cert_chain should not be null * Reformat with black * Fix <OpenSSL.crypto.X509 object at 0x7fdbb59e8050> != <OpenSSL.crypto.X509 object at 0x7fdbb59daad0> * Add Changelog entry * Remove _add_chain
2020-08-05Deprecated pkcs7 and pkcs12 support (#921)Alex Gaynor
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:07:34 +0000