Revert change for windows cert pool access in 1.8 #29
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
|
LGTM |
thaJeztah
reviewed
Feb 3, 2017
tlsconfig/certpool_go17.go
Outdated
| @@ -14,7 +14,7 @@ import ( | |||
| func SystemCertPool() (*x509.CertPool, error) { | |||
| certpool, err := x509.SystemCertPool() | |||
| if err != nil && runtime.GOOS == "windows" { | |||
| logrus.Infof("Unable to use system certificate pool: %v", err) | |||
| logrus.Infof("Unable to use system certificate pool with custom certificate pool: %v", err) | |||
There was a problem hiding this comment.
The wording or the assumption that is used for a custom certificate pool?
There was a problem hiding this comment.
The wording is a bit confusing "use system pool with custom pool". Is the warning that they cannot be combined? (sorry can't fully grasp what it's saying 😄)
The upstream change to allow access to the windows system cert pool was reverted, reverting and updating messaging. Maybe 1.9....golang/go#18609 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
dmcgowan
force-pushed
the
revert-windows-go-18-system-pool
branch
from
6f510e0 to
f652133
Compare
|
Removed updated info message, whatever messaging is needed can be done by Docker. Added an empty check on the server side before calling that function to prevent setting an empty pool instead of nil. |
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.
The upstream change to allow access to the windows system cert pool was reverted, reverting and updating messaging. Maybe 1.9....golang/go#18609
Thanks @cyli for catching this!
ping @aaronlehmann