#include "select-keys.h"
#include "sigstatus.h"
#include "rfc2015.h"
+#include "alertpanel.h"
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
NULL
};
-static char *create_boundary (void);
+static void sig_expiration_check (GString *str,
+ GpgmeCtx ctx,
+ GpgmeKey key,
+ GpgmeSigStat status,
+ int idx);
+static void sig_expired (GString *str,
+ GpgmeCtx ctx,
+ int idx);
+static void sig_key_expired (GString *str,
+ GpgmeKey key,
+ int idx);
#if 0
static void dump_mimeinfo (const char *text, MimeInfo *x)
}
#endif
-void
-rfc2015_disable_all (void)
-{
- /* FIXME: set a flag, so that we don't bother the user with failed
- * gpgme messages */
-}
-
-
void
rfc2015_secure_remove (const char *fname)
{
}
-static const gchar *
-sig_status_to_string (GpgmeSigStat status)
-{
- const gchar *result;
-
- switch (status) {
- case GPGME_SIG_STAT_NONE:
- result = _("Oops: Signature not verified");
- break;
- case GPGME_SIG_STAT_NOSIG:
- result = _("No signature found");
- break;
- case GPGME_SIG_STAT_GOOD:
- result = _("Good signature");
- break;
- case GPGME_SIG_STAT_BAD:
- result = _("BAD signature");
- break;
- case GPGME_SIG_STAT_NOKEY:
- result = _("No public key to verify the signature");
- break;
- case GPGME_SIG_STAT_ERROR:
- result = _("Error verifying the signature");
- break;
- case GPGME_SIG_STAT_DIFF:
- result = _("Different results for signatures");
- break;
- default:
- result = _("Error: Unknown status");
- break;
- }
-
- return result;
-}
-
-static const gchar *
-sig_status_with_name (GpgmeSigStat status)
-{
- const gchar *result;
-
- switch (status) {
- case GPGME_SIG_STAT_NONE:
- result = _("Oops: Signature not verified");
- break;
- case GPGME_SIG_STAT_NOSIG:
- result = _("No signature found");
- break;
- case GPGME_SIG_STAT_GOOD:
- result = _("Good signature from \"%s\"");
- break;
- case GPGME_SIG_STAT_BAD:
- result = _("BAD signature from \"%s\"");
- break;
- case GPGME_SIG_STAT_NOKEY:
- result = _("No public key to verify the signature");
- break;
- case GPGME_SIG_STAT_ERROR:
- result = _("Error verifying the signature");
- break;
- case GPGME_SIG_STAT_DIFF:
- result = _("Different results for signatures");
- break;
- default:
- result = _("Error: Unknown status");
- break;
- }
-
- return result;
-}
-
-static void
-sig_status_for_key(GString *str, GpgmeCtx ctx, GpgmeSigStat status,
- GpgmeKey key, const gchar *fpr)
-{
- gint idx = 0;
- const char *uid;
-
- uid = gpgme_key_get_string_attr (key, GPGME_ATTR_USERID, NULL, idx);
- if (uid == NULL) {
- g_string_sprintfa (str, "%s\n",
- sig_status_to_string (status));
- if ((fpr != NULL) && (*fpr != '\0'))
- g_string_sprintfa (str, "Key fingerprint: %s\n", fpr);
- g_string_append (str, _("Cannot find user ID for this key."));
- return;
- }
- g_string_sprintfa (str, sig_status_with_name (status), uid);
- g_string_append (str, "\n");
-
- while (1) {
- uid = gpgme_key_get_string_attr (key, GPGME_ATTR_USERID,
- NULL, ++idx);
- if (uid == NULL)
- break;
- g_string_sprintfa (str, _(" aka \"%s\"\n"),
- uid);
- }
-}
-
-static gchar *
-sig_status_full (GpgmeCtx ctx)
-{
- GString *str;
- gint sig_idx = 0;
- GpgmeError err;
- GpgmeSigStat status;
- GpgmeKey key;
- const char *fpr;
- time_t created;
- struct tm *ctime_val;
- char ctime_str[80];
- gchar *retval;
-
- str = g_string_new ("");
-
- fpr = gpgme_get_sig_status (ctx, sig_idx, &status, &created);
- while (fpr != NULL) {
- if (created != 0) {
- ctime_val = localtime (&created);
- strftime (ctime_str, sizeof (ctime_str), "%c",
- ctime_val);
- g_string_sprintfa (str,
- _("Signature made at %s\n"),
- ctime_str);
- }
- err = gpgme_get_sig_key (ctx, sig_idx, &key);
- if (err != 0) {
- g_string_sprintfa (str, "%s\n",
- sig_status_to_string (status));
- if ((fpr != NULL) && (*fpr != '\0'))
- g_string_sprintfa (str,
- _("Key fingerprint: %s\n"),
- fpr);
- } else {
- sig_status_for_key (str, ctx, status, key, fpr);
- gpgme_key_unref (key);
- }
- g_string_append (str, "\n\n");
-
- fpr = gpgme_get_sig_status (ctx, ++sig_idx, &status, &created);
- }
-
- retval = str->str;
- g_string_free (str, FALSE);
- return retval;
-}
-
-static void check_signature (MimeInfo *mimeinfo, MimeInfo *partinfo, FILE *fp)
-{
- GpgmeCtx ctx = NULL;
- GpgmeError err;
- GpgmeData sig = NULL, text = NULL;
- GpgmeSigStat status = GPGME_SIG_STAT_NONE;
- GpgmegtkSigStatus statuswindow = NULL;
- const char *result = NULL;
-
- if (prefs_common.gpg_signature_popup)
- statuswindow = gpgmegtk_sig_status_create ();
-
- err = gpgme_new (&ctx);
- if (err) {
- debug_print ("gpgme_new failed: %s\n", gpgme_strerror (err));
- goto leave;
- }
-
- /* don't include the last character (LF). It does not belong to the
- * signed text */
- err = gpgme_data_new_from_filepart (&text, NULL, fp,
- mimeinfo->children->fpos,
- mimeinfo->children->size ?
- (mimeinfo->children->size - 1) : 0 );
- if (!err)
- err = gpgme_data_new_from_filepart (&sig, NULL, fp,
- partinfo->fpos, partinfo->size);
- if (err) {
- debug_print ("gpgme_data_new_from_filepart failed: %s\n",
- gpgme_strerror (err));
- goto leave;
- }
-
- err = gpgme_op_verify (ctx, sig, text, &status);
- if (err) {
- debug_print ("gpgme_op_verify failed: %s\n", gpgme_strerror (err));
- goto leave;
- }
-
- /* FIXME: check what the heck this sig_status_full stuff is.
- * it should better go into sigstatus.c */
- g_free (partinfo->sigstatus_full);
- partinfo->sigstatus_full = sig_status_full (ctx);
-
-leave:
- result = gpgmegtk_sig_status_to_string(status);
- debug_print("verification status: %s\n", result);
- if (prefs_common.gpg_signature_popup)
- gpgmegtk_sig_status_update (statuswindow, ctx);
-
- g_free (partinfo->sigstatus);
- partinfo->sigstatus = g_strdup (result);
-
- gpgme_data_release (sig);
- gpgme_data_release (text);
- gpgme_release (ctx);
- if (prefs_common.gpg_signature_popup)
- gpgmegtk_sig_status_destroy (statuswindow);
-}
-
/*
* Copy a gpgme data object to a temporary file and
* return this filename
}
err = gpgme_data_new_from_filepart (&cipher, NULL, fp,
- partinfo->fpos, partinfo->size);
+ partinfo->offset, partinfo->length);
if (err) {
debug_print ("gpgme_data_new_from_filepart failed: %s\n",
gpgme_strerror (err));
return plain;
}
-MimeInfo * rfc2015_find_signature (MimeInfo *mimeinfo)
-{
- MimeInfo *partinfo;
- int n = 0;
-
- if (!mimeinfo)
- return NULL;
- if (g_strcasecmp (mimeinfo->content_type, "multipart/signed"))
- return NULL;
-
- debug_print ("** multipart/signed encountered\n");
-
- /* check that we have at least 2 parts of the correct type */
- for (partinfo = mimeinfo->children;
- partinfo != NULL; partinfo = partinfo->next) {
- if (++n > 1 && !g_strcasecmp (partinfo->content_type,
- "application/pgp-signature"))
- break;
- }
-
- return partinfo;
-}
-
-gboolean rfc2015_has_signature (MimeInfo *mimeinfo)
-{
- return rfc2015_find_signature (mimeinfo) != NULL;
-}
-
-void rfc2015_check_signature (MimeInfo *mimeinfo, FILE *fp)
-{
- MimeInfo *partinfo;
-
- partinfo = rfc2015_find_signature (mimeinfo);
- if (!partinfo)
- return;
-
-#if 0
- g_message ("** yep, it is a pgp signature");
- dump_mimeinfo ("gpg-signature", partinfo );
- dump_part (partinfo, fp );
- dump_mimeinfo ("signed text", mimeinfo->children );
- dump_part (mimeinfo->children, fp);
-#endif
-
- check_signature (mimeinfo, partinfo, fp);
-}
-
int rfc2015_is_encrypted (MimeInfo *mimeinfo)
{
- if (!mimeinfo)
+ if (!mimeinfo || mimeinfo->type != MIMETYPE_MULTIPART)
return 0;
- if (g_strcasecmp (mimeinfo->content_type, "multipart/encrypted"))
+ if (g_strcasecmp (mimeinfo->subtype, "encrypted"))
return 0;
/* fixme: we should check the protocol parameter */
return 1;
{
FILE *fp;
MimeInfo *mimeinfo;
- int ret;
+ int ret = 0;
+#if 0 /* FIXME */
if ((fp = fopen(file, "rb")) == NULL)
return FALSE;
ret = rfc2015_is_encrypted(mimeinfo);
procmime_mimeinfo_free_all(mimeinfo);
+#endif
return ret != 0 ? TRUE : FALSE;
}
FILE *dstfp;
size_t nread;
char buf[BUFFSIZE];
+ int in_cline;
GpgmeError err;
g_return_if_fail (msginfo != NULL);
g_return_if_fail (mimeinfo != NULL);
g_return_if_fail (fp != NULL);
- g_return_if_fail (mimeinfo->mime_type == MIME_MULTIPART);
+ g_return_if_fail (mimeinfo->type == MIMETYPE_MULTIPART);
debug_print ("** decrypting multipart/encrypted message\n");
+#if 0 /* FIXME */
+
/* skip headers */
- if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
+ if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
perror("fseek");
tmpinfo = procmime_scan_mime_header(fp);
- if (!tmpinfo || tmpinfo->mime_type != MIME_MULTIPART) {
+ if (!tmpinfo || tmpinfo->type != MIMETYPE_MULTIPART) {
DECRYPTION_ABORT();
}
- procmime_scan_multipart_message(tmpinfo, fp);
+ procmime_scan_message(tmpinfo);
/* check that we have the 2 parts */
partinfo = tmpinfo->children;
if (!partinfo || !partinfo->next) {
DECRYPTION_ABORT();
}
- if (!g_strcasecmp (partinfo->content_type, "application/pgp-encrypted")) {
+ if ((partinfo->type == MIMETYPE_APPLICATION) && !g_strcasecmp(partinfo->subtype, "pgp-encrypted")) {
/* Fixme: check that the version is 1 */
ver_ok = 1;
}
partinfo = partinfo->next;
- if (ver_ok &&
- !g_strcasecmp (partinfo->content_type, "application/octet-stream")) {
+ if (ver_ok && (partinfo->type == MIMETYPE_APPLICATION) &&
+ !g_strcasecmp (partinfo->subtype, "octet-stream")) {
if (partinfo->next)
g_warning ("oops: pgp_encrypted with more than 2 parts");
}
}
/* write the orginal header to the new file */
- if (fseek(fp, tmpinfo->fpos, SEEK_SET) < 0)
+ if (fseek(fp, tmpinfo->offset, SEEK_SET) < 0)
perror("fseek");
+ in_cline = 0;
while (fgets(buf, sizeof(buf), fp)) {
- if (headerp (buf, content_names))
+ if (headerp (buf, content_names)) {
+ in_cline = 1;
continue;
+ }
+ if (in_cline) {
+ if (buf[0] == ' ' || buf[0] == '\t')
+ continue;
+ in_cline = 0;
+ }
if (buf[0] == '\r' || buf[0] == '\n')
break;
fputs (buf, dstfp);
msginfo->plaintext_file = fname;
msginfo->decryption_failed = 0;
+
+#endif
}
#undef DECRYPTION_ABORT
GpgmeRecipients rset = NULL;
size_t nread;
int mime_version_seen = 0;
- char *boundary = create_boundary ();
+ char *boundary;
+
+ boundary = generate_mime_boundary ("Encrypt");
/* Create the list of recipients */
rset = gpgmegtk_recipient_selection (recp_list);
}
/* get the content header lines from the source */
- clineidx=0;
+ clineidx = 0;
saved_last = 0;
while (!err && fgets(buf, sizeof(buf), fp)) {
/* fixme: check for overlong lines */
continue;
}
if (saved_last) {
- saved_last = 0;
if (*buf == ' ' || *buf == '\t') {
- char *last = clines[clineidx-1];
- clines[clineidx-1] = g_strconcat (last, buf, NULL);
+ char *last = clines[clineidx - 1];
+ clines[clineidx - 1] = g_strconcat (last, buf, NULL);
g_free (last);
continue;
}
+ saved_last = 0;
}
if (headerp (buf, mime_version_name))
GpgmeData sigdata = NULL;
size_t nread;
int mime_version_seen = 0;
- char *boundary = create_boundary ();
+ char *boundary;
char *micalg = NULL;
char *siginfo;
+ boundary = generate_mime_boundary ("Signature");
+
/* Open the source file */
if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
continue;
}
if (saved_last) {
- saved_last = 0;
if (*buf == ' ' || *buf == '\t') {
char *last = clines[clineidx - 1];
clines[clineidx - 1] = g_strconcat (last, buf, NULL);
g_free (last);
continue;
}
+ saved_last = 0;
}
if (headerp (buf, mime_version_name))
fprintf (fp, "Content-Type: multipart/signed; "
"protocol=\"application/pgp-signature\";\r\n");
if (micalg)
- fprintf (fp, " micalg=\"%s\";", micalg);
+ fprintf (fp, " micalg=\"%s\";\r\n", micalg);
fprintf (fp, " boundary=\"%s\"\r\n", boundary);
/* Part 1: signed material */
return -1;
}
-
-/****************
- * Create a new boundary in a way that it is very unlikely that this
- * will occur in the following text. It would be easy to ensure
- * uniqueness if everything is either quoted-printable or base64
- * encoded (note that conversion is allowed), but because MIME bodies
- * may be nested, it may happen that the same boundary has already
- * been used. We avoid scanning the message for conflicts and hope the
- * best.
- *
- * boundary := 0*69<bchars> bcharsnospace
- * bchars := bcharsnospace / " "
- * bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
- * "+" / "_" / "," / "-" / "." /
- * "/" / ":" / "=" / "?"
- */
-
-static char *
-create_boundary (void)
-{
- static char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "1234567890'()+_,./:=?";
- char buf[17];
- int i, equal;
- int pid;
-
- pid = getpid();
-
- /* We make the boundary depend on the pid, so that all running
- * processed generate different values even when they have been
- * started within the same second and srand48(time(NULL)) has been
- * used. I can't see whether this is really an advantage but it
- * doesn't do any harm.
- */
- equal = -1;
- for(i = 0; i < sizeof(buf) - 1; i++) {
- buf[i] = tbl[(lrand48() ^ pid) % (sizeof(tbl) - 1)]; /* fill with random */
- if(buf[i] == '=' && equal == -1)
- equal = i;
- }
- buf[i] = 0;
-
- /* now make sure that we do have the sequence "=." in it which cannot
- * be matched by quoted-printable or base64 encoding */
- if(equal != -1 && (equal+1) < i)
- buf[equal+1] = '.';
- else {
- buf[0] = '=';
- buf[1] = '.';
- }
-
- return g_strdup(buf);
-}
-
#endif /* USE_GPGME */
projects / claws.git / blobdiff