diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-pgp-context.c | 5 | ||||
| -rw-r--r-- | camel/camel-pgp-mime.c | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 911bd366f6..e90a43f046 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2002-02-14 Jeffrey Stedfast <fejj@ximian.com> + + * camel-pgp-context.c (pgp_sign): Pass --always-trust to gpg + (requested by users). + (pgp_clearsign): Same. + (pgp_encrypt): Here too. + 2002-02-12 Jeffrey Stedfast <fejj@ximian.com> * providers/smtp/camel-smtp-transport.c (smtp_helo): Since the diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index 16b3ea72b7..85354dca7f 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -626,6 +626,7 @@ pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash, argv[i++] = "--no-secmem-warning"; argv[i++] = "--no-greeting"; argv[i++] = "--yes"; + argv[i++] = "--always-trust"; argv[i++] = "--batch"; argv[i++] = "--armor"; @@ -727,7 +728,7 @@ pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx); GByteArray *plaintext; CamelStream *stream; - char *argv[15]; + char *argv[20]; char *ciphertext = NULL; char *diagnostics = NULL; char *passphrase = NULL; @@ -806,6 +807,7 @@ pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash argv[i++] = "--no-secmem-warning"; argv[i++] = "--no-greeting"; argv[i++] = "--yes"; + argv[i++] = "--always-trust"; argv[i++] = "--batch"; argv[i++] = "--armor"; @@ -1181,6 +1183,7 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr g_ptr_array_add (argv, "--no-secmem-warning"); g_ptr_array_add (argv, "--no-greeting"); g_ptr_array_add (argv, "--yes"); + g_ptr_array_add (argv, "--always-trust"); g_ptr_array_add (argv, "--batch"); g_ptr_array_add (argv, "--armor"); diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c index 4afa137aec..f65f0f78a1 100644 --- a/camel/camel-pgp-mime.c +++ b/camel/camel-pgp-mime.c @@ -353,7 +353,6 @@ camel_pgp_mime_part_verify (CamelPgpContext *context, CamelMimePart *mime_part, CamelMimeFilter *crlf_filter, *from_filter; CamelStream *stream, *sigstream; CamelCipherValidity *valid; - CamelContentType *type; g_return_val_if_fail (mime_part != NULL, NULL); g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL); |