Upgrade OpenSSL for CVE-2017-3732, CVE-2017-3193 #31147
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
lheckemann
reviewed
Nov 2, 2017
| - file = (char *)getenv(X509_get_default_cert_file_env()); | ||
| + file = (char *)getenv("NIX_SSL_CERT_FILE"); | ||
| - file = getenv(X509_get_default_cert_file_env()); | ||
| + file = getenv("NIX_SSL_CERT_FILE"); | ||
| + if (!file) | ||
| + file = (char *)getenv(X509_get_default_cert_file_env()); |
There was a problem hiding this comment.
Should probably remove the (char *) here as well to match the upstream code more closely and because the cast isn't actually safe AFAIK.
manveru
reviewed
Nov 2, 2017
| - file = (char *)getenv(X509_get_default_cert_file_env()); | ||
| + file = (char *)getenv("NIX_SSL_CERT_FILE"); | ||
| - file = getenv(X509_get_default_cert_file_env()); | ||
| + file = getenv("NIX_SSL_CERT_FILE"); | ||
| + if (!file) | ||
| + file = (char *)getenv(X509_get_default_cert_file_env()); |
There was a problem hiding this comment.
Given the first one removed the cast, I think we don't need the (char *) in the second getenv call anymore.
manveru
approved these changes
Nov 2, 2017
lheckemann
approved these changes
Nov 2, 2017
|
Building them now to verify... Edit: My laptop is sweating and says they both build fine :) |
|
For reference: openssl/openssl@a020f54#diff-c6d4516ecf80b8c5f05c60e476619d0d is the commit that breaks our patch. (thanks @manveru for digging it up) |
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.
Motivation for this change
Closes #31144
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)