server: Read PKSC8 private keys #14
Merged
Conversation
This file contains 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
Currently the server only attempts to parse RSA private keys. This change updates the server to first attempt to read PKSC8 private keys before attempting to parse the key file as RSA.
hawkw
approved these changes
Feb 28, 2022
kubert/src/server.rs
Outdated
|
|
||
| // Load and return a single private key. | ||
| let keys = rustls_pemfile::rsa_private_keys(&mut reader)?; | ||
| let keys = rustls_pemfile::pkcs8_private_keys(&mut BufReader::new(pem.as_slice())) | ||
| .or_else(|_| rustls_pemfile::rsa_private_keys(&mut BufReader::new(pem.as_slice())))?; |
There was a problem hiding this comment.
do we want to maybe log something about which format the keys were parsed in?
There was a problem hiding this comment.
I could go either way. for now I'll trust that whatever rustls logs is good enough
adleong
reviewed
Feb 28, 2022
hawkw
approved these changes
Feb 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Currently the server only attempts to parse RSA private keys. This
change updates the server to first attempt to read PKSC8 private keys
before attempting to parse the key file as RSA.