Skip to content

[3.9] bpo-40479: Fix hashlib's usedforsecurity for OpenSSL 3.0.0 (GH-30455) (GH-30574) #30574

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
tiran merged 2 commits into from
Jan 13, 2022
Merged

[3.9] bpo-40479: Fix hashlib's usedforsecurity for OpenSSL 3.0.0 (GH-30455) (GH-30574) #30574

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8384add
[3.9] bpo-40479: Fix hashlib's usedforsecurity for OpenSSL 3.0.0 (GH-…
tiran Jan 13, 2022
90bf161
Fixed const and missing XOF issue
tiran Jan 13, 2022
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
Fixed const and missing XOF issue
  • Loading branch information
@tiran
tiran committed Jan 13, 2022
commit 90bf1617d6f98ca7829c6510a4cbe4626ac408b4
7 changes: 5 additions & 2 deletions Modules/_hashopenssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,9 +886,12 @@ py_evp_fromname(PyObject *module, const char *digestname, PyObject *data_obj,
goto exit;
}

#ifdef PY_OPENSSL_HAS_SHAKE
if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) {
type = get_hashlib_state(module)->EVPXOFtype;
} else {
} else
#endif
{
type = get_hashlib_state(module)->EVPtype;
}

Expand Down Expand Up @@ -1452,7 +1455,7 @@ _hashlib_hmac_singleshot_impl(PyObject *module, Py_buffer *key,
unsigned char md[EVP_MAX_MD_SIZE] = {0};
unsigned int md_len = 0;
unsigned char *result;
const EVP_MD *evp;
PY_EVP_MD *evp;

evp = py_digest_by_name(module, digest, Py_ht_mac);
if (evp == NULL) {
Expand Down