Fix trust and file handling for S/MIME (11.0) #309
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
The certificates used for S/MIME encryption are now added to the GPG trust list automatically because users cannot always confirm trust. Also, a data buffer with custom I/O functions is used to write the encrypted data because gpgme_data_new_from_stream can cause problems when trying to write afterwards.
2 tasks
mattmundell
requested changes
Dec 23, 2019
util/gpgmeutils.c
Outdated
| { | ||
| struct gpgme_data_cbs *callbacks; | ||
|
|
||
| callbacks = malloc (sizeof (struct gpgme_data_cbs)); |
There was a problem hiding this comment.
Suggested change
| callbacks = malloc (sizeof (struct gpgme_data_cbs)); | |
| callbacks = g_malloc0 (sizeof (struct gpgme_data_cbs)); |
There was a problem hiding this comment.
We usually use the glib wrapper, which checks the malloc return.
util/gpgmeutils.c
Outdated
| GString *trustlist_content; | ||
| GError *g_err; | ||
|
|
||
| g_err = NULL; gpgme_set_pinentry_mode (ctx, GPGME_PINENTRY_MODE_CANCEL); |
There was a problem hiding this comment.
Suggested change
| g_err = NULL; gpgme_set_pinentry_mode (ctx, GPGME_PINENTRY_MODE_CANCEL); | |
| g_err = NULL; | |
| gpgme_set_pinentry_mode (ctx, GPGME_PINENTRY_MODE_CANCEL); |
util/gpgmeutils.c
Outdated
| callbacks->read = gvm_gpgme_fread; | ||
| callbacks->write = gvm_gpgme_fwrite; | ||
|
|
||
| return gpgme_data_new_from_cbs (new_data, callbacks, file); |
There was a problem hiding this comment.
Where is callbacks freed? Should callbacks->release be set to do this?
There was a problem hiding this comment.
Alternatively callbacks could be passed in from the caller, so it doesn't need to be freed.
mattmundell
approved these changes
Dec 24, 2019
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 certificates used for S/MIME encryption are now added to the GPG
trust list automatically because users cannot always confirm trust.
Also, a data buffer with custom I/O functions is used to write the
encrypted data because gpgme_data_new_from_stream can cause problems
when trying to write afterwards.
Checklist: