projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bye bye DT_SYS variables.
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
d0104a7
..
297eb73
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-130,7
+130,7
@@
static int pgp_copy_checksig (FILE * fpin, FILE * fpout)
rv = 0;
}
rv = 0;
}
- if (strncmp (line, "[GNUPG:] ", 9) == 0)
+ if (
m_
strncmp (line, "[GNUPG:] ", 9) == 0)
continue;
fputs (line, fpout);
fputc ('\n', fpout);
continue;
fputs (line, fpout);
fputc ('\n', fpout);
@@
-454,6
+454,7
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
char tempfile[_POSIX_PATH_MAX];
char buf[HUGE_STRING];
FILE *tfp;
char tempfile[_POSIX_PATH_MAX];
char buf[HUGE_STRING];
FILE *tfp;
+ int tempfd;
short sgn = 0;
short enc = 0;
short sgn = 0;
short enc = 0;
@@
-465,14
+466,14
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
if (tagged_only && !b->tagged)
return 0;
if (tagged_only && !b->tagged)
return 0;
-
mutt_mktemp (tempfile
);
- if (mutt_decode_save_attachment (fp, b, tempf
ile, 0
, 0) != 0) {
+
tempfd = m_tempfd(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (mutt_decode_save_attachment (fp, b, tempf
d
, 0) != 0) {
unlink (tempfile);
return 0;
}
unlink (tempfile);
return 0;
}
- if (
(tfp = fopen (tempfile, "r")) == NULL
) {
- unlink
(tempfile);
+ if (
!(tfp = fopen(tempfile, "r"))
) {
+ unlink(tempfile);
return 0;
}
return 0;
}
@@
-695,7
+696,7
@@
BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
while (fgets (buf, sizeof (buf) - 1, pgpout) != NULL) {
len = m_strlen(buf);
if (len > 1 && buf[len - 2] == '\r')
while (fgets (buf, sizeof (buf) - 1, pgpout) != NULL) {
len = m_strlen(buf);
if (len > 1 && buf[len - 2] == '\r')
- strcpy (buf + len - 2, "\n"); /* __STRCPY_CHECKED__ */
+ m_strcpy(buf + len - 2, len - 2, "\n");
fputs (buf, fpout);
}
fputs (buf, fpout);
}
@@
-974,7
+975,7
@@
BODY *pgp_sign_message (BODY * a)
static short is_numerical_keyid (const char *s)
{
/* or should we require the "0x"? */
static short is_numerical_keyid (const char *s)
{
/* or should we require the "0x"? */
- if (strncmp (s, "0x", 2) == 0)
+ if (
m_
strncmp (s, "0x", 2) == 0)
s += 2;
if (m_strlen(s) % 8)
return 0;
s += 2;
if (m_strlen(s) % 8)
return 0;
@@
-1022,8
+1023,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
last = &((*last)->next);
}
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
+ rfc822_qualify (tmp, fqdn);
address_list_uniq(tmp);
address_list_uniq(tmp);
@@
-1040,7
+1040,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
p->mailbox);
if ((r = mutt_yesorno (buf, M_YES)) == M_YES) {
if (is_numerical_keyid (keyID)) {
p->mailbox);
if ((r = mutt_yesorno (buf, M_YES)) == M_YES) {
if (is_numerical_keyid (keyID)) {
- if (strncmp (keyID, "0x", 2) == 0)
+ if (
m_
strncmp (keyID, "0x", 2) == 0)
keyID += 2;
goto bypass_selection; /* you don't see this. */
}
keyID += 2;
goto bypass_selection; /* you don't see this. */
}
@@
-1048,8
+1048,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
- if (fqdn)
- rfc822_qualify (addr, fqdn);
+ rfc822_qualify (addr, fqdn);
q = addr;
}
else
q = addr;
}
else
@@
-1087,7
+1086,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
bypass_selection:
keylist_size += m_strlen(keyID) + 4;
p_realloc(&keylist, keylist_size);
bypass_selection:
keylist_size += m_strlen(keyID) + 4;
p_realloc(&keylist, keylist_size);
- sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "",
/* __SPRINTF_CHECKED__ */
+ sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "",
keyID);
keylist_used = m_strlen(keylist);
keyID);
keylist_used = m_strlen(keylist);
@@
-1388,7
+1387,7
@@
BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
int pgp_send_menu (HEADER * msg, int *redraw)
{
pgp_key_t p;
int pgp_send_menu (HEADER * msg, int *redraw)
{
pgp_key_t p;
- char input_signas[S
HORT_S
TRING];
+ char input_signas[STRING];
char prompt[LONG_STRING];
char prompt[LONG_STRING];
@@
-1426,11
+1425,6
@@
int pgp_send_menu (HEADER * msg, int *redraw)
crypt_pgp_void_passphrase (); /* probably need a different passphrase */
}
crypt_pgp_void_passphrase (); /* probably need a different passphrase */
}
-#if 0
- else {
- msg->security &= ~SIGN;
- }
-#endif
*redraw = REDRAW_FULL;
break;
*redraw = REDRAW_FULL;
break;