Content-Length: 315085 | pFad | http://github.com/python/cpython/pull/119244/commits/403b9171038868f22ac48e21ffa8c1e641209db7

4A gh-109945: Enable spec of multiple curves/groups for TLS by planetf1 · Pull Request #119244 · python/cpython · GitHub
Skip to content

gh-109945: Enable spec of multiple curves/groups for TLS #119244

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

gh-109945: Enable spec of multiple curves/groups for TLS #119244

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
403b917
gh-109945 Enable spec of multiple curves/groups for TLS
planetf1 May 20, 2024
8ac3842
gh-109945 Additional testcases for ssl
planetf1 Jun 4, 2024
65490a2
gh-109945 Refine exception & add more tests
planetf1 Jun 3, 2024
8ec8608
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 4, 2024
ebad50c
gh-109945 update documentation
planetf1 Jun 4, 2024
af71eee
gh-109945 fix incorrect reference management of string
planetf1 Jun 4, 2024
8459b66
gh-109945 fix openssl<3 tests
planetf1 Jun 4, 2024
1af4b23
gh-109945 update docs to clarify change is OpenSSL 3 and above
planetf1 Jun 4, 2024
b48e5bc
gh-109945 Corrected typo/whitespace in docs
planetf1 Jun 4, 2024
42ec0c8
gh-109945 Correct thread issue
planetf1 Jun 4, 2024
67fd580
gh-109945 do not call _setSSLError
planetf1 Jun 4, 2024
fae2620
gh-109945 remove commented code
planetf1 Jul 17, 2024
8a2cbde
gh-109945 update NEWS to correct function call format check
planetf1 Jul 17, 2024
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
Next Next commit
gh-109945 Enable spec of multiple curves/groups for TLS 
Signed-off-by: Nigel Jones <jonesn@uk.ibm.com>
  • Loading branch information
@planetf1
planetf1 committed Jul 17, 2024
commit 403b9171038868f22ac48e21ffa8c1e641209db7
9 changes: 6 additions & 3 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4379,18 +4379,19 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self, PyObject *name)
/*[clinic end generated code: output=23022c196e40d7d2 input=c2bafb6f6e34726b]*/
{
PyObject *name_bytes;
int nid;

if (!PyUnicode_FSConverter(name, &name_bytes))
return NULL;
assert(PyBytes_Check(name_bytes));
#if OPENSSL_VERSION_MAJOR < 3
int nid;
nid = OBJ_sn2nid(PyBytes_AS_STRING(name_bytes));
Py_DECREF(name_bytes);
if (nid == 0) {
PyErr_Format(PyExc_ValueError,
"unknown elliptic curve name %R", name);
return NULL;
}
#if OPENSSL_VERSION_MAJOR < 3
EC_KEY *key = EC_KEY_new_by_curve_name(nid);
if (key == NULL) {
_setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
Expand All @@ -4399,7 +4400,9 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self, PyObject *name)
SSL_CTX_set_tmp_ecdh(self->ctx, key);
EC_KEY_free(key);
#else
if (!SSL_CTX_set1_groups(self->ctx, &nid, 1)) {
int res = SSL_CTX_set1_groups_list(self->ctx, PyBytes_AS_STRING(name_bytes));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SSL_CTX_set1_groups_list also supports another syntax, adding a ? before the curve name makes it "optional", quoting the docs:

If a group name is preceded with the ? character, it will be ignored if an implementation is missing.

This isn't tested in our test suite, it would be useful to test that so future contributors know that syntax exists.

Py_DECREF(name_bytes);
if (!res) {
_setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
return NULL;
}
Expand Down








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/python/cpython/pull/119244/commits/403b9171038868f22ac48e21ffa8c1e641209db7

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy