+2006-11-11 [colin] 2.6.0cvs31
+
+ * src/plugins/pgpinline/pgpinline.c
+ * src/plugins/pgpmime/pgpmime.c
+ Check success after calling gpgme_new
+ Maybe fixes bug 1057, 'crash on sending
+ signed message to a newsgroup'
+
2006-11-11 [colin] 2.6.0cvs30
* src/undo.c
( cvs diff -u -r 1.382.2.326 -r 1.382.2.327 src/compose.c; cvs diff -u -r 1.50.2.28 -r 1.50.2.29 src/compose.h; ) > 2.6.0cvs28.patchset
( cvs diff -u -r 1.274.2.155 -r 1.274.2.156 src/mainwindow.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/bogofilter/bogofilter_gtk.c; ) > 2.6.0cvs29.patchset
( cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/undo.c; ) > 2.6.0cvs30.patchset
+( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpmime/pgpmime.c; ) > 2.6.0cvs31.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
static PrivacyDataPGP *pgpinline_new_privacydata()
{
PrivacyDataPGP *data;
+ gpgme_error_t err;
data = g_new0(PrivacyDataPGP, 1);
data->data.system = &pgpinline_system;
data->done_sigtest = FALSE;
data->is_signed = FALSE;
data->sigstatus = NULL;
- gpgme_new(&data->ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return NULL;
+ }
return data;
}
gchar *textdata = NULL, *tmp = NULL;
gpgme_data_t plain = NULL, cipher = NULL;
gpgme_ctx_t ctx;
-
+ gpgme_error_t err;
+
g_return_val_if_fail(mimeinfo != NULL, 0);
if (procmime_mimeinfo_parent(mimeinfo) == NULL)
textdata = g_strdup(tmp);
g_free(tmp);
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return 0;
+ }
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
gpgme_data_new(&gpgsig);
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
i = 0;
while (fprs[i] && strlen(fprs[i])) {
gpgme_key_t key;
/* encrypt data */
gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
gpgme_data_new(&gpgenc);
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
gpgme_set_armor(ctx, 1);
err = gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
static PrivacyDataPGP *pgpmime_new_privacydata()
{
PrivacyDataPGP *data;
+ gpgme_error_t err;
data = g_new0(PrivacyDataPGP, 1);
data->data.system = &pgpmime_system;
data->done_sigtest = FALSE;
data->is_signed = FALSE;
data->sigstatus = NULL;
- gpgme_new(&data->ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ g_warning(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return NULL;
+ }
return data;
}
g_return_val_if_fail(mimeinfo != NULL, -1);
g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
data = (PrivacyDataPGP *) mimeinfo->privacy;
- gpgme_new(&data->ctx);
+ if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return 0;
+ }
+
debug_print("Checking PGP/MIME signature\n");
gpgme_error_t err;
if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
- privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
return NULL;
}
gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
gpgme_data_new(&gpgsig);
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
gpgme_signers_clear (ctx);
kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
- gpgme_new(&ctx);
+ if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
+ debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+ return FALSE;
+ }
i = 0;
while (fprs[i] && strlen(fprs[i])) {
gpgme_key_t key;