#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)
{
case GPGME_SIG_STAT_GOOD:
result = _("Good signature");
break;
+ case GPGME_SIG_STAT_GOOD_EXP:
+ result = _("Good signature but it has expired");
+ break;
+ case GPGME_SIG_STAT_GOOD_EXPKEY:
+ result = _("Good signature but the key has expired");
+ break;
case GPGME_SIG_STAT_BAD:
result = _("BAD signature");
break;
case GPGME_SIG_STAT_GOOD:
result = _("Good signature from \"%s\"");
break;
+ case GPGME_SIG_STAT_GOOD_EXP:
+ result = _("Good signature from \"%s\" but it has expired");
+ break;
+ case GPGME_SIG_STAT_GOOD_EXPKEY:
+ result = _("Good signature from \"%s\" but the key has expired");
+ break;
case GPGME_SIG_STAT_BAD:
- result = _("BAD signature from \"%s\"");
+ result = _("BAD signature from \"%s\"");
break;
case GPGME_SIG_STAT_NOKEY:
result = _("No public key to verify the signature");
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."));
+ sig_expiration_check(str, ctx, key, status, 0);
return;
}
g_string_sprintfa (str, sig_status_with_name (status), uid);
g_string_sprintfa (str, _(" aka \"%s\"\n"),
uid);
}
+ sig_expiration_check(str, ctx, key, status, 0);
+}
+
+static void
+sig_expiration_check(GString *str, GpgmeCtx ctx, GpgmeKey key,
+ GpgmeSigStat status, int idx)
+{
+ if (status == GPGME_SIG_STAT_GOOD_EXP)
+ sig_expired(str, ctx, idx);
+ else if (status == GPGME_SIG_STAT_GOOD_EXPKEY)
+ sig_key_expired(str, key, idx);
+}
+
+static void
+sig_expired(GString *str, GpgmeCtx ctx, int idx)
+{
+ unsigned long exp_time;
+ exp_time = gpgme_get_sig_ulong_attr(ctx, idx, GPGME_ATTR_EXPIRE, 0);
+ g_string_sprintfa(str, _("Signature expired %s"), ctime(&exp_time));
+}
+
+static void
+sig_key_expired(GString *str, GpgmeKey key, int idx)
+{
+ unsigned long exp_time;
+ exp_time = gpgme_key_get_ulong_attr(key, GPGME_ATTR_EXPIRE, NULL, idx);
+ g_string_sprintfa(str, _("Key expired %s"), ctime(&exp_time));
}
static gchar *
strftime (ctime_str, sizeof (ctime_str), "%c",
ctime_val);
g_string_sprintfa (str,
- _("Signature made %s\n"),
+ _("Signature made at %s\n"),
ctime_str);
}
err = gpgme_get_sig_key (ctx, sig_idx, &key);
_("Key fingerprint: %s\n"),
fpr);
} else {
+ const char *key_id_str;
+
sig_status_for_key (str, ctx, status, key, fpr);
+ key_id_str = gpgme_key_get_string_attr(key,
+ GPGME_ATTR_KEYID, NULL, 0);
+ key_id_str += 8;
+ g_string_sprintfa (str, _("Key ID: %s\n"), key_id_str);
gpgme_key_unref (key);
}
g_string_append (str, "\n\n");
static void check_signature (MimeInfo *mimeinfo, MimeInfo *partinfo, FILE *fp)
{
+#if 0 /* FIXME */
GpgmeCtx ctx = NULL;
GpgmeError err;
GpgmeData sig = NULL, text = NULL;
GpgmeSigStat status = GPGME_SIG_STAT_NONE;
GpgmegtkSigStatus statuswindow = NULL;
const char *result = NULL;
+ gchar *tmp_file;
+ gint n_exclude_chars = 0;
if (prefs_common.gpg_signature_popup)
statuswindow = gpgmegtk_sig_status_create ();
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 );
+ /* don't include the last empty line.
+ It does not belong to the signed text */
+ if (mimeinfo->children->length > 0) {
+ if (fseek(fp, mimeinfo->children->offset + mimeinfo->children->length - 1,
+ SEEK_SET) < 0) {
+ perror("fseek");
+ goto leave;
+ }
+ if (fgetc(fp) == '\n') {
+ n_exclude_chars++;
+ if (mimeinfo->children->length > 1) {
+ if (fseek(fp, mimeinfo->children->offset + mimeinfo->children->length - 2,
+ SEEK_SET) < 0) {
+ perror("fseek");
+ goto leave;
+ }
+ if (fgetc(fp) == '\r')
+ n_exclude_chars++;
+ }
+ }
+ }
+
+ /* canonicalize the file part. */
+ tmp_file = get_tmp_file();
+ if (copy_file_part(fp, mimeinfo->children->offset,
+ mimeinfo->children->length - n_exclude_chars,
+ tmp_file) < 0) {
+ g_free(tmp_file);
+ goto leave;
+ }
+ if (canonicalize_file_replace(tmp_file) < 0) {
+ unlink(tmp_file);
+ g_free(tmp_file);
+ goto leave;
+ }
+
+ err = gpgme_data_new_from_file(&text, tmp_file, 1);
+
+ unlink(tmp_file);
+ g_free(tmp_file);
+
if (!err)
err = gpgme_data_new_from_filepart (&sig, 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));
}
err = gpgme_op_verify (ctx, sig, text, &status);
- if (err)
+ 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 */
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);
+ gpgmegtk_sig_status_update (statuswindow, ctx);
- g_assert (!err); /* FIXME: Hey: this may indeed happen */
g_free (partinfo->sigstatus);
partinfo->sigstatus = g_strdup (result);
+ partinfo->sig_ok = (status == GPGME_SIG_STAT_GOOD);
+ partinfo->sig_unknown = (status == GPGME_SIG_STAT_NOKEY);
+ partinfo->sig_expired = (status == GPGME_SIG_STAT_GOOD_EXP);
+ partinfo->key_expired = (status == GPGME_SIG_STAT_GOOD_EXPKEY);
gpgme_data_release (sig);
gpgme_data_release (text);
gpgme_release (ctx);
if (prefs_common.gpg_signature_popup)
gpgmegtk_sig_status_destroy (statuswindow);
+#endif
}
/*
}
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;
}
-gboolean rfc2015_msg_is_encrypted (gchar *file)
+gboolean rfc2015_msg_is_encrypted (const gchar *file)
{
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))
if (ascii_armored) {
fprintf(fp,
- "Content-Type: text/plain; charset=us-ascii\r\n"
+ "Content-Type: text/plain; charset=US-ASCII\r\n"
"Content-Transfer-Encoding: 7bit\r\n"
"\r\n");
} else {
/* and the final boundary */
if (!ascii_armored) {
fprintf (fp,
- "\r\n"
- "--%s--\r\n"
- "\r\n",
- boundary);
+ "\r\n"
+ "--%s--\r\n",
+ boundary);
}
fflush (fp);
if (ferror (fp)) {
* r_siginfo returns an XML object with information about the signature.
*/
static GpgmeData
-pgp_sign (GpgmeData plain, GSList *key_list, char **r_siginfo)
+pgp_sign (GpgmeData plain, GSList *key_list, gboolean clearsign,
+ char **r_siginfo)
{
GSList *p;
GpgmeCtx ctx = NULL;
if (err)
goto leave;
- err = gpgme_op_sign (ctx, plain, sig, GPGME_SIG_MODE_DETACH);
+ err = gpgme_op_sign
+ (ctx, plain, sig,
+ clearsign ? GPGME_SIG_MODE_CLEAR : GPGME_SIG_MODE_DETACH);
if (!err)
*r_siginfo = gpgme_get_op_info (ctx, 0);
/*
* Extract the micalg from an GnupgOperationInfo XML container.
*/
-const char *
+static char *
extract_micalg (char *xml)
{
const char *s;
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))
goto failure;
}
- sigdata = pgp_sign (plain, key_list, &siginfo);
+ sigdata = pgp_sign (plain, key_list, FALSE, &siginfo);
if (siginfo) {
micalg = extract_micalg (siginfo);
free (siginfo);
header = NULL;
if (!mime_version_seen)
- fputs ("MIME-Version: 1\r\n", fp);
+ fputs ("MIME-Version: 1.0\r\n", fp);
fprintf (fp, "Content-Type: multipart/signed; "
"protocol=\"application/pgp-signature\";\r\n");
if (micalg)
- fprintf (fp, " micalg=%s;", micalg );
- fprintf (fp, " boundary=\"%s\"\r\n", boundary );
+ fprintf (fp, " micalg=\"%s\";\r\n", micalg);
+ fprintf (fp, " boundary=\"%s\"\r\n", boundary);
/* Part 1: signed material */
- fprintf (fp, "\r\n--%s\r\n", boundary);
+ fprintf (fp, "\r\n"
+ "--%s\r\n",
+ boundary);
err = gpgme_data_rewind (plain);
if (err) {
debug_print ("gpgme_data_rewind on plain failed: %s\n",
}
/* Part 2: signature */
- fprintf (fp, "\r\n--%s\r\n", boundary);
+ fprintf (fp, "\r\n"
+ "--%s\r\n",
+ boundary);
fputs ("Content-Type: application/pgp-signature\r\n"
"\r\n", fp);
}
/* Final boundary */
- fprintf (fp, "\r\n--%s--\r\n\r\n", boundary);
+ fprintf (fp, "\r\n"
+ "--%s--\r\n",
+ boundary);
fflush (fp);
if (ferror (fp)) {
FILE_OP_ERROR (file, "fwrite");
}
-/****************
- * 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 / "'" / "(" / ")" /
- * "+" / "_" / "," / "-" / "." /
- * "/" / ":" / "=" / "?"
+/*
+ * Sign the file with clear text and replace its content with the signed one.
*/
-
-static char *
-create_boundary (void)
+gint
+rfc2015_clearsign (const gchar *file, GSList *key_list)
{
- 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] = '.';
+ FILE *fp;
+ gchar buf[BUFFSIZE];
+ GpgmeError err;
+ GpgmeData text = NULL;
+ GpgmeData sigdata = NULL;
+ size_t nread;
+ gchar *siginfo;
+
+ if ((fp = fopen(file, "rb")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ goto failure;
+ }
+
+ err = gpgme_data_new(&text);
+ if (err) {
+ debug_print("gpgme_data_new failed: %s\n", gpgme_strerror(err));
+ goto failure;
}
- return g_strdup(buf);
+ while (!err && fgets(buf, sizeof(buf), fp)) {
+ err = gpgme_data_write(text, buf, strlen(buf));
+ }
+ if (ferror(fp)) {
+ FILE_OP_ERROR(file, "fgets");
+ goto failure;
+ }
+ if (err) {
+ debug_print("gpgme_data_write failed: %s\n", gpgme_strerror(err));
+ goto failure;
+ }
+
+ sigdata = pgp_sign(text, key_list, TRUE, &siginfo);
+ if (siginfo) {
+ g_free(siginfo);
+ }
+ if (!sigdata)
+ goto failure;
+
+ if (fclose(fp) == EOF) {
+ FILE_OP_ERROR(file, "fclose");
+ fp = NULL;
+ goto failure;
+ }
+ if ((fp = fopen(file, "wb")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ goto failure;
+ }
+
+ err = gpgme_data_rewind(sigdata);
+ if (err) {
+ debug_print("gpgme_data_rewind on sigdata failed: %s\n",
+ gpgme_strerror(err));
+ goto failure;
+ }
+
+ while (!(err = gpgme_data_read(sigdata, buf, sizeof(buf), &nread))) {
+ fwrite(buf, nread, 1, fp);
+ }
+ if (err != GPGME_EOF) {
+ debug_print("gpgme_data_read failed: %s\n", gpgme_strerror(err));
+ goto failure;
+ }
+
+ if (fclose(fp) == EOF) {
+ FILE_OP_ERROR(file, "fclose");
+ fp = NULL;
+ goto failure;
+ }
+ gpgme_data_release(text);
+ gpgme_data_release(sigdata);
+ return 0;
+
+failure:
+ if (fp)
+ fclose(fp);
+ gpgme_data_release(text);
+ gpgme_data_release(sigdata);
+ return -1;
}
#endif /* USE_GPGME */
projects / claws.git / blobdiff