add the ability to decrypt TLS private keys #35
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
cyli
reviewed
Mar 23, 2017
tlsconfig/config.go
Outdated
| if err != nil { | ||
| return nil, errors.Wrap(err, "private key is encrypted, but could not decrypt it") | ||
| } | ||
| keyBytes = pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: keyBytes}) |
There was a problem hiding this comment.
Usually this contains a type, such as EC PRIVATE KEY or RSA PRIVATE KEY - we can probably just keep the previous one: keyBytes = pem.EncodeToMemory(&pem.Block{Type: pemBlock.Type, Bytes: keyBytes})
cyli
reviewed
Mar 23, 2017
tlsconfig/config_test.go
Outdated
|
|
||
| if err == nil || tlsConfig != nil { | ||
| t.Fatal("Expected failure due to incorrect passphrase.") | ||
| } |
There was a problem hiding this comment.
Do we want to assert that it is specifically a passphrase error?
if !IsErrEncryptedKey(err) || tlsConfig != nil {
...
There was a problem hiding this comment.
Thank you for the review @cyli. Yes, this seems a better test. I have updated the PR to address both changes (pem.EncodeToMemory() and the specific passphrase error in the test.
|
Thanks for working on this @adshmh! |
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
adshmh
force-pushed
the
enhancement-decrypt-TLS-private-key
branch
from
b00eb56
to
9a08a30
Compare
cyli
approved these changes
Mar 24, 2017
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.
added the ability to accept a passphrase and decrypt a TLS private key, by adding a 'Passphrase' to the Options struct and the functionality required to decrypt TLS keys.
This is needed to address moby/moby#30935. A few rounds of reviews were done in moby/moby#31364 on the code in this PR as part of stubbing out the overall implementation.
Signed-off-by: Arash Deshmeh adeshmeh@ca.ibm.com