Improve error handling with different OpenSSL versions #672
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?
Backports saltstack/salt#66818
With the most recent versions of
cryptography
module the exception value which is checked here https://github.com/saltstack/salt/blob/246d0664577ef72da8bd1f0c4dff0d18b4428b23/salt/utils/x509.py#L704 is different.The latest version of
cryptography
is returning https://github.com/pyca/cryptography/blob/932b8a3f67810140a6e178f7b676e1cb9c3585b1/src/rust/src/backend/utils.rs#L463It could also be returned with the lower version of
cryptography
depending 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_managed
state function could fail with the commentCould not load PEM-encoded private key
The following tests could fail as well:
New Behavior
No test fails and
x509.private_key_managed
state with most recentcryptography
or 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.
See GitHub's page on GPG signing for more information about signing commits with GPG.