aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-03make our CI less frustrating (#926)Paul Kehrer
* make our CI less frustrating * sigh, even less sensitive * can we stop doing this on macos now?
2020-08-03_only_ update the image (#925)Alex Gaynor
* _only_ update the image * Update .travis.yml Co-authored-by: Paul Kehrer <paul.l.kehrer@gmail.com>
2020-08-03use larger keys in ssl tests (#922)Alex Gaynor
2020-08-03Remove RPM build script that we have no idea if it works (#923)Alex Gaynor
* Remove RPM build script that we have no idea if it works * MANIFEST.in as well
2020-07-28Add SSL.Context.set_keylog_callback (#910)Maximilian Hils
* add SSL.Context.set_keylog_callback * don't fail on missing attribute * lint! * make it black
2020-07-23Paint it Black by the Rolling Stones (#920)Alex Gaynor
2020-07-12Fix Travis CI build config validation issues (#918)Christian Clauss
* `sudo` key is deprecated * `os` key is missing * `matrix` is an alias for `jobs`
2020-06-24Fix generated test X.509 certificates. (#917)David Benjamin
From RFC 5280, section 4.1.2.9: [Extensions] MUST only appear if the version is 3 (Section 4.1.2.1). If present, this field is a SEQUENCE of one or more certificate extensions. The format and content of certificate extensions in the Internet PKI are defined in Section 4.2. X509 objects default to v1, so the test certs need a set_version(2) call. (Note v3 is encoded as 2.)
2020-05-22Remove deprecated tsafe module. (#913)Benjamin Peterson
2020-05-21Remove dead examples directory from flake8 invocation. (#914)Benjamin Peterson
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 93db1979ff -s ours am: a32cf1a74e am: af2b64a786 am: 7f7a955bfc -s ours am skip reason: subject contains skip directive Change-Id: I9a92fabbbd35238d76f6b75131da31b075264f41
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 93db1979ff -s ours am: a32cf1a74e am: af2b64a786 Change-Id: I4fbe3fe30da90ba86dc005ad6d37685195209674
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 93db1979ff -s ours am: a32cf1a74e Change-Id: I60b54eb4f13e5d420c8bdeeb352819c18636348c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 93db1979ff -s ours am skip reason: subject contains skip directive Change-Id: Iaa807b216bfb736ea4206b5ae437f6c283f1d716
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Ibb41a9f5e242bfefc8007d5d507642a7e657900c
2020-04-07Update to a more modern macOS image (#909)Alex Gaynor
2020-04-07Drop OpenSSL 1.0.1 (#908)Alex Gaynor
2020-03-31Remove asserts (#904)Adrián Chaves
2020-03-30Uhhh, fix twisted tests to actually run twisted (wat) (#906)Alex Gaynor
* Uhhh, fix twisted tests to actually run twisted (wat) * Update tox.ini
2020-03-30Run twisted tests under py3 (#905)Alex Gaynor
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4 am: c7e5bf0c9a am: ↵Bob Badour
6c8ee9c9d5 am: db8b16b12b am: dea9bcdc12 Change-Id: Id9db6f72128380693975ef07a367fdf653aa968c
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4 am: c7e5bf0c9a am: ↵Bob Badour
6c8ee9c9d5 am: db8b16b12b Change-Id: Ia2149352317bb60832475ff5e9804f006718a80b
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4 am: c7e5bf0c9a am: ↵Bob Badour
6c8ee9c9d5 Change-Id: I5af87598b48372832eb01e784f933d5d0a75ed59
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4 am: c7e5bf0c9aBob Badour
Change-Id: Id5ecf5e46e179562974cb1fd31d0bccc5b481068
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4 am: c7e5bf0c9aBob Badour
Change-Id: I145bf958d7970d77fb427e16d3015904a75c789f
2020-03-26Remove redundant NOTICE symbolic link. am: a9b70222b4Bob Badour
Change-Id: Ie1e04da0cc7b8cefbe44443409c0da23186dda17
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Idff7b9e1267e01557e4b9488ca29df524f18d55e
2020-03-11Fix PKey.check for some broken keys (#897)Mrmaxmeier
* fix PKey.check for some broken keys RSA_check_key is documented to return 1 for valid keys. It (currently) returns 0 or -1 for invalid ones. The previous code accepted invalid keys if RSA_check_key returns -1! * add test
2020-01-12Make tests pass in the future (now the present) (#888)Alex Gaynor
2019-12-15Drop support for Python 3.4, since cryptography dropped it (#884)Alex Gaynor
2019-11-18Make the code slightly resillient to python4 (#880)Alex Gaynor
2019-11-18Random cleanup around our usage of binary_type (#879)Alex Gaynor
2019-11-18reopen master, call it 20.0 because let's be honest with ourselves (#878)Paul Kehrer
2019-11-17version bump for 19.1 release (#877)Paul Kehrer
2019-11-18ALPN: complete handshake without accepting a client's protocols. (#876)Mark Williams
* ALPN: complete handshake without accepting a client's protocols. The callback passed to `SSL_CTX_set_alpn_select_cb` can return `SSL_TLSEXT_ERR_NOACK` to allow the handshake to continue without accepting any of the client's offered protocols. This commit introduces `NO_OVERLAPPING_PROTOCOLS`, which the Python callback passed to `Context.set_alpn_select_callback` can return to achieve the same thing. It does not change the previous meaning of an empty string, which still terminates the handshake. * Update src/OpenSSL/SSL.py Co-Authored-By: Alex Gaynor <alex.gaynor@gmail.com> * Address @alex's review. * Use recorded value in test, fix lint error. * Cover TypeError branch in _ALPNHelper.callback
2019-11-18use _ffi.from_buffer() to support bytearray (#852)Daniel Holth
* use _ffi.from_buffer(buf) in send, to support bytearray * add bytearray test * update CHANGELOG.rst * move from_buffer before 'buffer too long' check * context-managed from_buffer + black * don't shadow buf in send() * test return count for sendall * test sending an array * fix test * also use from_buffer in bio_write * de-format _util.py * formatting * add simple bio_write tests * wrap line
2019-11-17bump the minimum cryptography version (#875)Paul Kehrer
Users with older cryptography (and hence potentially older asn1crypto, a transitive dependency) are seeing a serious bug on macOS catalina due to the way older asn1crypto loads a shared library. While this isn't a pyOpenSSL bug bumping this dep might prevent the bug from impacting some users.
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 50ab7f8d5b am: 437d7a3e93 -s ours am skip reason: subject contains skip directive Change-Id: Ia4572e22ea41aaf358c94e24f593f6077cd343bc
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 50ab7f8d5b Change-Id: If5c36706a6de0c3103165350122b91f93b4466dd
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ic191d50c5d2d7420466548489a5df4ef5c2e6f53
2019-10-20Fixes #868 -- test on py38 (#870)Alex Gaynor
2019-08-29Fix for Python 4 (#862)Hugo van Kemenade
* Fix for Python 4 * Fix for Python 4
2019-08-02Expose OP_NO_TLSv1_3 (#861)Nathaniel J. Smith
* Expose OP_NO_TLSv1_3 * Support openssl <1.1.1
2019-07-29Stop lawyers from emailing Hynek (#856)Hynek Schlawack
* Stop lawyers from emailing Hynek * Update setup.py
2019-07-24Add in TEST_MAPPING for acloud unittests. am: c56bf3350e am: 545be996e3 am: ↵Kevin Cheng
4510db3f7d am: c579137737 am: a5a6094880 Change-Id: Ib22e22aa7a44e2e98b1d6195744a8706fb7327e0
2019-07-23Add in TEST_MAPPING for acloud unittests. am: c56bf3350e am: 545be996e3 am: ↵Kevin Cheng
4510db3f7d am: c579137737 Change-Id: Ief282fbd738b43c54843eed0c4e646cce14aa4e5
2019-07-23Add in TEST_MAPPING for acloud unittests. am: c56bf3350e am: 545be996e3Kevin Cheng
am: 4510db3f7d Change-Id: I55b6ea639314fb69d52d5c3a853dc0a7e643ce28
2019-07-23Add in TEST_MAPPING for acloud unittests. am: c56bf3350eKevin Cheng
am: 545be996e3 Change-Id: If3c16a85a5b61184dd668ee4e643e3aae7613b50
2019-07-23Add in TEST_MAPPING for acloud unittests.ndk-sysroot-r21Kevin Cheng
am: c56bf3350e Change-Id: I5e3ead493868937447ae13c343878e0cb5381af7
2019-07-23Add in TEST_MAPPING for acloud unittests.Kevin Cheng
Bug: 124250384 Test: atest Change-Id: I6648ef15bfbcb6561c20c41cbec4b8d9404177d2