which tmp_smime_pbody->parts after signing. */
tmp_smime_pbody->parts = tmp_smime_pbody->parts->next;
msg->content->next = NULL;
- mutt_free_body (&tmp_smime_pbody);
+ body_list_wipe(&tmp_smime_pbody);
}
pbody = tmp_pbody;
}
/* remove the outer multipart layer */
tmp_pgp_pbody = mutt_remove_multipart (tmp_pgp_pbody);
/* get rid of the signature */
- mutt_free_body (&tmp_pgp_pbody->next);
+ body_list_wipe(&tmp_pgp_pbody->next);
}
return (-1);
*/
if (flags != msg->security) {
tmp_pgp_pbody = mutt_remove_multipart (tmp_pgp_pbody);
- mutt_free_body (&tmp_pgp_pbody->next);
+ body_list_wipe(&tmp_pgp_pbody->next);
}
}
}
!b->subtype || ascii_strcasecmp (b->subtype, "signed"))
return 0;
- if (!(p = mutt_get_parameter ("protocol", b->parameter)))
+ if (!(p = parameter_getval(b->parameter, "protocol")))
return 0;
if (!(ascii_strcasecmp (p, "multipart/mixed")))
if (!b || b->type != TYPEMULTIPART ||
!b->subtype || ascii_strcasecmp (b->subtype, "encrypted") ||
- !(p = mutt_get_parameter ("protocol", b->parameter)) ||
+ !(p = parameter_getval(b->parameter, "protocol")) ||
ascii_strcasecmp (p, "application/pgp-encrypted"))
return 0;
if (m->type == TYPEAPPLICATION) {
if (!ascii_strcasecmp (m->subtype, "pgp")
|| !ascii_strcasecmp (m->subtype, "x-pgp-message")) {
- if ((p = mutt_get_parameter ("x-action", m->parameter))
+ if ((p = parameter_getval(m->parameter, "x-action"))
&& (!ascii_strcasecmp (p, "sign")
|| !ascii_strcasecmp (p, "signclear")))
t |= PGPSIGN;
- if ((p = mutt_get_parameter ("format", m->parameter)) &&
+ if ((p = parameter_getval(m->parameter, "format")) &&
!ascii_strcasecmp (p, "keys-only"))
t |= PGPKEY;
t |= PGPKEY;
}
else if (m->type == TYPETEXT && ascii_strcasecmp ("plain", m->subtype) == 0) {
- if (((p = mutt_get_parameter ("x-mutt-action", m->parameter))
- || (p = mutt_get_parameter ("x-action", m->parameter))
- || (p = mutt_get_parameter ("action", m->parameter)))
+ if (((p = parameter_getval(m->parameter, "x-mutt-action"))
+ || (p = parameter_getval(m->parameter, "x-action"))
+ || (p = parameter_getval(m->parameter, "action")))
&& !ascii_strncasecmp ("pgp-sign", p, 8))
t |= PGPSIGN;
else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
/* S/MIME MIME types don't need x- anymore, see RFC2311 */
if (!ascii_strcasecmp (m->subtype, "x-pkcs7-mime") ||
!ascii_strcasecmp (m->subtype, "pkcs7-mime")) {
- if ((t = mutt_get_parameter ("smime-type", m->parameter))) {
+ if ((t = parameter_getval(m->parameter, "smime-type"))) {
if (!ascii_strcasecmp (t, "enveloped-data"))
return SMIMEENCRYPT;
else if (!ascii_strcasecmp (t, "signed-data"))
else if (ascii_strcasecmp (m->subtype, "octet-stream"))
return 0;
- t = mutt_get_parameter ("name", m->parameter);
+ t = parameter_getval(m->parameter, "name");
if (!t)
t = m->d_filename;
short goodsig = 1;
int rc = 0;
- protocol = mutt_get_parameter ("protocol", a->parameter);
+ protocol = parameter_getval(a->parameter, "protocol");
a = a->parts;
/* extract the protocol information */