aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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
2020-08-05focal time (#929)Paul Kehrer
* focal time * larger dh params, assert on something * urllib3 fix * actually check an error
2020-08-03remove npn support entirely. you should be using alpn (#932)Paul Kehrer
* remove npn support entirely. you should be using alpn * flake8
2020-08-03use SSLv23_METHOD so we get "best TLS" in most tests. (#931)Paul Kehrer
2020-08-03use modern message digests (#930)Paul Kehrer
2020-08-03newer pypy (#928)Paul Kehrer
* newer pypy * missed one * we don't support ancient cffi any more
2020-08-03update cert fixtures and simplify tests (#927)Paul Kehrer
* simplify * generate new certs and keys with 3072-bit RSA * black * add a test to avoid losing coverage