/*
- * Copyright (C) 1998-2000 Werner Koch <werner.koch@guug.de>
- * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
+ * Copyright (C) 1998-2000,2003 Werner Koch <werner.koch@guug.de>
+ * Copyright (C) 1999-2003 Thomas Roessler <roessler@does-not-exist.org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General Public
memcpy (uid, buf, ob-buf);
uid[ob-buf] = '\0';
}
- else if (ob-buf == n && (buf[n] = 0, strlen (buf) < n))
+ else if (n >= 0 && ob-buf == n && (buf[n] = 0, strlen (buf) < (size_t)n))
memcpy (uid, buf, n);
}
FREE (&buf);
char *pend, *p;
int trust = 0;
int flags = 0;
+ struct pgp_keyinfo tmp;
*is_subkey = 0;
if (!*buf)
return NULL;
-
+
+ /* if we're given a key, merge our parsing results, else
+ * start with a fresh one to work with so that we don't
+ * mess up the real key in case we find parsing errors. */
+ if (k)
+ memcpy (&tmp, k, sizeof (tmp));
+ else
+ memset (&tmp, 0, sizeof (tmp));
+
dprint (2, (debugfile, "parse_pub_line: buf = `%s'\n", buf));
-
+
for (p = buf; p; p = pend)
{
if ((pend = strchr (p, ':')))
case 1: /* record type */
{
dprint (2, (debugfile, "record type: %s\n", p));
-
+
if (!mutt_strcmp (p, "pub"))
;
else if (!mutt_strcmp (p, "sub"))
is_uid = 1;
else
return NULL;
-
+
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k = safe_calloc (sizeof *k, 1);
+ memset (&tmp, 0, sizeof (tmp));
break;
}
case 2: /* trust info */
{
dprint (2, (debugfile, "trust info: %s\n", p));
-
+
switch (*p)
{ /* look only at the first letter */
case 'e':
}
if (!is_uid && !(*is_subkey && option (OPTPGPIGNORESUB)))
- k->flags |= flags;
+ tmp.flags |= flags;
break;
}
case 3: /* key length */
{
-
dprint (2, (debugfile, "key len: %s\n", p));
-
- if (!(*is_subkey && option (OPTPGPIGNORESUB)))
- k->keylen = atoi (p); /* fixme: add validation checks */
+
+ if (!(*is_subkey && option (OPTPGPIGNORESUB)) &&
+ mutt_atos (p, &tmp.keylen) < 0)
+ goto bail;
break;
}
case 4: /* pubkey algo */
{
-
dprint (2, (debugfile, "pubkey algorithm: %s\n", p));
-
+
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
{
- k->numalg = atoi (p);
- k->algorithm = pgp_pkalgbytype (atoi (p));
+ int x = 0;
+ if (mutt_atoi (p, &x) < 0)
+ goto bail;
+ tmp.numalg = x;
+ tmp.algorithm = pgp_pkalgbytype (x);
}
break;
}
case 5: /* 16 hex digits with the long keyid. */
{
dprint (2, (debugfile, "key id: %s\n", p));
-
+
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
- mutt_str_replace (&k->keyid, p);
+ mutt_str_replace (&tmp.keyid, p);
break;
}
{
char tstr[11];
struct tm time;
-
+
dprint (2, (debugfile, "time stamp: %s\n", p));
-
+
if (!p)
break;
time.tm_sec = 0;
time.tm_hour = 12;
strncpy (tstr, p, 11);
tstr[4] = '\0';
- time.tm_year = atoi (tstr)-1900;
tstr[7] = '\0';
- time.tm_mon = (atoi (tstr+5))-1;
- time.tm_mday = atoi (tstr+8);
- k->gen_time = mutt_mktime (&time, 0);
+ if (mutt_atoi (tstr, &time.tm_year) < 0)
+ {
+ p = tstr;
+ goto bail;
+ }
+ time.tm_year -= 1900;
+ if (mutt_atoi (tstr+5, &time.tm_mon) < 0)
+ {
+ p = tstr+5;
+ goto bail;
+ }
+ time.tm_mon -= 1;
+ if (mutt_atoi (tstr+8, &time.tm_mday) < 0)
+ {
+ p = tstr+8;
+ goto bail;
+ }
+ tmp.gen_time = mutt_mktime (&time, 0);
break;
}
case 7: /* valid for n days */
/* ignore user IDs on subkeys */
if (!is_uid && (*is_subkey && option (OPTPGPIGNORESUB)))
break;
-
+
dprint (2, (debugfile, "user ID: %s\n", p));
-
+
uid = safe_calloc (sizeof (pgp_uid_t), 1);
fix_uid (p);
uid->addr = safe_strdup (p);
uid->trust = trust;
uid->flags |= flags;
- uid->parent = k;
- uid->next = k->address;
- k->address = uid;
-
+ uid->next = tmp.address;
+ tmp.address = uid;
+
if (strstr (p, "ENCR"))
- k->flags |= KEYFLAG_PREFER_ENCRYPTION;
+ tmp.flags |= KEYFLAG_PREFER_ENCRYPTION;
if (strstr (p, "SIGN"))
- k->flags |= KEYFLAG_PREFER_SIGNING;
+ tmp.flags |= KEYFLAG_PREFER_SIGNING;
break;
}
|| !((flags & KEYFLAG_DISABLED)
|| (flags & KEYFLAG_REVOKED)
|| (flags & KEYFLAG_EXPIRED))))
- k->flags |= flags;
+ tmp.flags |= flags;
break;
break;
}
}
+
+ /* merge temp key back into real key */
+ if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
+ k = safe_malloc (sizeof (*k));
+ memcpy (k, &tmp, sizeof (*k));
+ /* fixup parentship of uids after mering the temp key into
+ * the real key */
+ if (tmp.address)
+ {
+ for (uid = k->address; uid; uid = uid->next)
+ uid->parent = k;
+ }
+
return k;
+
+bail:
+ dprint(5,(debugfile,"parse_pub_line: invalid number: '%s'\n", p));
+ return NULL;
}
pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
if (ferror (fp))
mutt_perror ("fgets");
- fclose (fp);
+ safe_fclose (&fp);
mutt_wait_filter (thepid);
close (devnull);
projects / software / mutt-debian.git / blobdiff