[master] Make error checking of x509 compatible with cryptography >= 43.0.0 #66818
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
salt-project-bot-prod-environment
bot
changed the title
twangboy
approved these changes
Aug 20, 2024
3 tasks
Akm0d
approved these changes
Dec 17, 2024
agraul
pushed a commit
to agraul/salt
that referenced
this pull request
Jan 27, 2025
* Make error checking of x509 more flexible for most recent cryptography and openSSL versions * Add test for different exception value on loading private key * Add fix for test_privkey_new_with_prereq on old OpenSSL BACKPORT-UPSTREAM=saltstack#66818
for most recent cryptography and openSSL versions
dwoz
force-pushed
the
better-error-handling-x509
branch
from
2480d1b to
6a199f5
Compare
dwoz
approved these changes
Jul 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
With the most recent versions of
cryptographymodule the exception value which is checked heresalt/salt/utils/x509.py
Line 704 in 246d066
The latest version of
cryptographyis returning https://github.com/pyca/cryptography/blob/932b8a3f67810140a6e178f7b676e1cb9c3585b1/src/rust/src/backend/utils.rs#L463It could also be returned with the lower version of
cryptographydepending on the combination with the OpenSSL version it's used with.What issues does this PR fix or reference?
Tracks: https://github.com/SUSE/spacewalk/issues/24859
Previous Behavior
x509.private_key_managedstate function could fail with the commentCould not load PEM-encoded private keyThe following tests could fail as well:
New Behavior
No test fails and
x509.private_key_managedstate with most recentcryptographyor some other OpenSSL versions which can produce different errors on such cases.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices, including the
PR Guidelines.
See GitHub's page on GPG signing for more information about signing commits with GPG.