[ssl] Use grpc_core::Slice in LoadSystemRoots. #36045
Open
+56
−36
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
matthewstevenson88
added
area/core
release notes: no
grpc-checks
bot
added
bloat/none
per-call-memory/neutral
per-channel-memory/neutral
labels
grpc-checks
bot
added
per-call-memory/decrease
and removed
per-call-memory/neutral
labels
grpc-checks
bot
added
bloat/low
per-call-memory/neutral
and removed
bloat/none
per-call-memory/decrease
labels
|
@markdroth PTAL when you have a few moments. :) |
markdroth
reviewed
May 10, 2024
|
|
||
| // Returns a slice containing roots from the OS trust store | ||
| grpc_slice LoadSystemRootCerts(); | ||
| Slice LoadSystemRootCerts(); |
There was a problem hiding this comment.
While we're at it, how about changing this to return absl::StatusOr<Slice>, so that we have a more obvious way of returning an error?
| @@ -62,13 +62,13 @@ const char* kCertFiles[] = {"/etc/ssl/cert.pem"}; | |||
| const char* kCertDirectories[] = {""}; | |||
| #endif // GPR_APPLE | |||
|
|
|||
| grpc_slice GetSystemRootCerts() { | |||
| Slice GetSystemRootCerts() { | |||
| size_t num_cert_files_ = GPR_ARRAY_SIZE(kCertFiles); | |||
There was a problem hiding this comment.
Pre-existing nit: This should not have an underscore suffix, since it's not a class data member.
| @@ -135,26 +135,25 @@ grpc_slice CreateRootCertsBundle(const char* certs_directory) { | |||
| } | |||
| } | |||
| } | |||
| bundle_slice = grpc_slice_new(bundle_string, bytes_read, gpr_free); | |||
| return bundle_slice; | |||
| return Slice(grpc_slice_new(bundle_string, bytes_read, gpr_free)); | |||
There was a problem hiding this comment.
This should be:
return Slice::FromCopiedBuffer(bundle_string, bytes_read);
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.
This is some cleanup that was identified during the review of #34874.