Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-136306: Add support for SSL groups #136307

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
picnixz merged 16 commits into from
Jul 28, 2025
Merged

gh-136306: Add support for SSL groups #136307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
662d66e
gh-136306: Initial cut at SSL groups support
ronf Jul 4, 2025
9acb2c3
Fix regen and lint issues
ronf Jul 4, 2025
03072c4
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 4, 2025
187ff2e
gh-136306: Address first round of comments
ronf Jul 5, 2025
452bdec
gh-136306: Add back indentation of example
ronf Jul 5, 2025
9b4066b
gh-136306: Handle another allocation failure in get_groups()
ronf Jul 5, 2025
a6ad433
gh-136306: Address additional review comments
ronf Jul 5, 2025
aecc96b
gh-136306: Fix method references in whatsnew entry.
ronf Jul 5, 2025
05c75a5
gh-136306: Add missing documentation for SSLSocket.group()
ronf Jul 5, 2025
304c223
gh-136306: Address additional review comments
ronf Jul 6, 2025
b516200
gh-136306: Minor doc updates
ronf Jul 7, 2025
e0fdd25
gh-136306: Missed one
ronf Jul 7, 2025
35a3ae0
gh-136306: Address additional review comments
ronf Jul 12, 2025
e0baf56
Add checks that cipher() and group() return None on handshake failure
ronf Jul 12, 2025
c5a1146
Merge branch 'main' into ssl-group-support
ronf Jul 19, 2025
5e626a6
gh-136306: Regenerate clinic signature to fix missing end fo line
ronf Jul 19, 2025
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
gh-136306: Address additional review comments
  • Loading branch information
@ronf
ronf committed Jul 12, 2025
commit 35a3ae0896dfd4cd4522aa3479ec32aa080308f5
9 changes: 1 addition & 8 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,22 +964,15 @@ def test_get_ciphers(self):

def test_set_groups(self):
ctx = ssl.create_default_context()

# Test valid group list
self.assertIsNone(ctx.set_groups('P-256:X25519'))
Comment thread
picnixz marked this conversation as resolved.

# Test invalid group list
self.assertRaises(ssl.SSLError, ctx.set_groups, 'P-256:xxx')
Comment thread
picnixz marked this conversation as resolved.

@unittest.skipUnless(CAN_GET_AVAILABLE_OPENSSL_GROUPS,
"OpenSSL version doesn't support getting groups")
def test_get_groups(self):
ctx = ssl.create_default_context()

# P-256 isn't an IANA name, so it shouldn't be returned by default
# By default, only return official IANA names.
self.assertNotIn('P-256', ctx.get_groups())
Comment thread
picnixz marked this conversation as resolved.

# Aliases like P-256 sbould be returned when include_aliases is set
self.assertIn('P-256', ctx.get_groups(include_aliases=True))
Comment thread
picnixz marked this conversation as resolved.

def test_options(self):
Expand Down
4 changes: 2 additions & 2 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3462,7 +3462,7 @@ _ssl__SSLContext_get_groups_impl(PySSLContext *self, int include_aliases)
#if OPENSSL_VERSION_NUMBER >= 0x30500000L
STACK_OF(OPENSSL_CSTRING) *groups = NULL;
const char *group;
size_t i, num;
int i, num;
PyObject *item, *result = NULL;

// This "groups" object is dynamically allocated, but the strings inside
Expand Down Expand Up @@ -3492,7 +3492,7 @@ _ssl__SSLContext_get_groups_impl(PySSLContext *self, int include_aliases)
// Group names are plain ASCII, so there's no chance of a decoding
Comment thread
picnixz marked this conversation as resolved.
// error here. However, an allocation failure could occur when
// constructing the Unicode version of the names.
item = PyUnicode_DecodeFSDefault(group);
item = PyUnicode_DecodeASCII(group, strlen(group), "strict");
if (item == NULL) {
_setSSLError(get_state_ctx(self), "Can't allocate group name", 0, __FILE__, __LINE__);
goto error;
Expand Down