Skip to content

gh-63284: Add support for TLS-PSK (pre-shared key) to the ssl module #103181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 22 commits into from
Nov 27, 2023
Merged

gh-63284: Add support for TLS-PSK (pre-shared key) to the ssl module #103181

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9d0f6dc
gh-63284: Add support for TLS-PSK (pre-shared key) to the ssl module
grantramsay Mar 29, 2023
cfddf7b
Fix TLS-PSK for TLS 1.3
grantramsay Apr 3, 2023
603eeef
Merge branch 'main' into fix-issue-63284
arhadthedev May 14, 2023
18302e3
Decode TLS-PSK identities as UTF-8 rather than ASCII
grantramsay Jun 4, 2023
2efc876
Change TLS-PSK version added from 3.12 to 3.13
grantramsay Jun 4, 2023
a56784c
ReSTify NEWS.
gpshead Jun 5, 2023
7a1963d
Merge branch 'main' into fix-issue-63284
gpshead Jul 14, 2023
6f4100c
Set python exceptions raised during C callbacks as unraisable
grantramsay Jul 15, 2023
e4a97ec
Add NULL check for defensive coding
grantramsay Jul 15, 2023
3d75982
Get single value using PyBytes_AsStringAndSize
grantramsay Jul 15, 2023
539ed1f
Do not raise a decode exception if remote side sends invalid UTF-8 du…
grantramsay Jul 16, 2023
4634fc3
Free TLS-PSK callbacks when SSL context is deallocated
grantramsay Jul 16, 2023
d21c322
Use Py_XINCREF and Py_XDECREF for tidier NULL checking
grantramsay Jul 16, 2023
03fac4d
Check return value of SSL_CTX_use_psk_identity_hint
grantramsay Jul 16, 2023
3db3921
Update TLS-PSK documentation
grantramsay Jul 16, 2023
a75f3a7
Regenerate news entry to update the timestamp
grantramsay Jul 16, 2023
851a1e5
Merge branch 'main' into fix-issue-63284
gpshead Nov 26, 2023
4c68974
Update example key strings in the doc.
gpshead Nov 26, 2023
0fb8a3e
Update TLS-PSK documentation
grantramsay Nov 26, 2023
7788589
Regenerate news entry to update the timestamp
grantramsay Nov 26, 2023
11735b9
Code defensively around `z#` vs NULL and 0 length.
gpshead Nov 27, 2023
ad8b249
Merge branch 'fix-issue-63284' of https://github.com/grantramsay/cpyt…
gpshead Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into fix-issue-63284
  • Loading branch information
@gpshead
gpshead authored Jul 14, 2023
commit 7a1963df63c85ef8aa4b447e01054c718cf77ede
9 changes: 0 additions & 9 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3199,15 +3199,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
usage for no cost at all. */
SSL_CTX_set_mode(self->ctx, SSL_MODE_RELEASE_BUFFERS);

/* Setting the session id context is a server-side only operation.
* It can cause unexpected behaviour on client-side connections. */
if (proto_version == PY_SSL_VERSION_TLS_SERVER) {
#define SID_CTX "Python"
SSL_CTX_set_session_id_context(self->ctx, (const unsigned char *) SID_CTX,
sizeof(SID_CTX));
#undef SID_CTX
}

params = SSL_CTX_get0_param(self->ctx);
/* Improve trust chain building when cross-signed intermediate
certificates are present. See https://bugs.python.org/issue23476. */
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.