2004-08-24 19:55:47 +00:00
|
|
|
/* keybox-openpgp.c - OpenPGP key parsing
|
2011-04-28 20:21:14 +02:00
|
|
|
* Copyright (C) 2001, 2003, 2011 Free Software Foundation, Inc.
|
2004-08-24 19:55:47 +00:00
|
|
|
*
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
*
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2004-08-24 19:55:47 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2004-08-24 19:55:47 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* This is a simple OpenPGP parser suitable for all OpenPGP key
|
|
|
|
material. It just provides the functionality required to build and
|
|
|
|
parse an KBX OpenPGP key blob. Thus it is not a complete parser.
|
|
|
|
However it is self-contained and optimized for fast in-memory
|
|
|
|
parsing. Note that we don't support old ElGamal v3 keys
|
|
|
|
anymore. */
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "keybox-defs.h"
|
|
|
|
|
|
|
|
#include <gcrypt.h>
|
|
|
|
|
2011-04-28 20:21:14 +02:00
|
|
|
#include "../common/openpgpdefs.h"
|
2015-02-11 10:27:57 +01:00
|
|
|
#include "host2net.h"
|
2004-08-24 19:55:47 +00:00
|
|
|
|
|
|
|
/* Assume a valid OpenPGP packet at the address pointed to by BUFBTR
|
2011-04-28 20:21:14 +02:00
|
|
|
which has a maximum length as stored at BUFLEN. Return the header
|
2004-08-24 19:55:47 +00:00
|
|
|
information of that packet and advance the pointer stored at BUFPTR
|
|
|
|
to the next packet; also adjust the length stored at BUFLEN to
|
|
|
|
match the remaining bytes. If there are no more packets, store NULL
|
|
|
|
at BUFPTR. Return an non-zero error code on failure or the
|
2011-04-28 20:21:14 +02:00
|
|
|
following data on success:
|
2004-08-24 19:55:47 +00:00
|
|
|
|
|
|
|
R_DATAPKT = Pointer to the begin of the packet data.
|
2011-02-04 12:57:53 +01:00
|
|
|
R_DATALEN = Length of this data. This has already been checked to fit
|
|
|
|
into the buffer.
|
2004-08-24 19:55:47 +00:00
|
|
|
R_PKTTYPE = The packet type.
|
|
|
|
R_NTOTAL = The total number of bytes of this packet
|
|
|
|
|
|
|
|
Note that these values are only updated on success.
|
|
|
|
*/
|
|
|
|
static gpg_error_t
|
|
|
|
next_packet (unsigned char const **bufptr, size_t *buflen,
|
|
|
|
unsigned char const **r_data, size_t *r_datalen, int *r_pkttype,
|
|
|
|
size_t *r_ntotal)
|
|
|
|
{
|
|
|
|
const unsigned char *buf = *bufptr;
|
|
|
|
size_t len = *buflen;
|
|
|
|
int c, ctb, pkttype;
|
|
|
|
unsigned long pktlen;
|
|
|
|
|
|
|
|
if (!len)
|
|
|
|
return gpg_error (GPG_ERR_NO_DATA);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
ctb = *buf++; len--;
|
|
|
|
if ( !(ctb & 0x80) )
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* Invalid CTB. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
pktlen = 0;
|
|
|
|
if ((ctb & 0x40)) /* New style (OpenPGP) CTB. */
|
|
|
|
{
|
|
|
|
pkttype = (ctb & 0x3f);
|
|
|
|
if (!len)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* No 1st length byte. */
|
|
|
|
c = *buf++; len--;
|
|
|
|
if (pkttype == PKT_COMPRESSED)
|
|
|
|
return gpg_error (GPG_ERR_UNEXPECTED); /* ... packet in a keyblock. */
|
|
|
|
if ( c < 192 )
|
|
|
|
pktlen = c;
|
|
|
|
else if ( c < 224 )
|
2011-02-04 12:57:53 +01:00
|
|
|
{
|
2004-08-24 19:55:47 +00:00
|
|
|
pktlen = (c - 192) * 256;
|
|
|
|
if (!len)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* No 2nd length byte. */
|
|
|
|
c = *buf++; len--;
|
|
|
|
pktlen += c + 192;
|
|
|
|
}
|
|
|
|
else if (c == 255)
|
|
|
|
{
|
|
|
|
if (len <4 )
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* No length bytes. */
|
2015-02-11 10:27:57 +01:00
|
|
|
pktlen = buf32_to_ulong (buf);
|
|
|
|
buf += 4;
|
2004-08-24 19:55:47 +00:00
|
|
|
len -= 4;
|
|
|
|
}
|
|
|
|
else /* Partial length encoding is not allowed for key packets. */
|
|
|
|
return gpg_error (GPG_ERR_UNEXPECTED);
|
|
|
|
}
|
|
|
|
else /* Old style CTB. */
|
|
|
|
{
|
|
|
|
int lenbytes;
|
|
|
|
|
|
|
|
pktlen = 0;
|
|
|
|
pkttype = (ctb>>2)&0xf;
|
|
|
|
lenbytes = ((ctb&3)==3)? 0 : (1<<(ctb & 3));
|
|
|
|
if (!lenbytes) /* Not allowed in key packets. */
|
|
|
|
return gpg_error (GPG_ERR_UNEXPECTED);
|
|
|
|
if (len < lenbytes)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* Not enough length bytes. */
|
|
|
|
for (; lenbytes; lenbytes--)
|
|
|
|
{
|
|
|
|
pktlen <<= 8;
|
|
|
|
pktlen |= *buf++; len--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do some basic sanity check. */
|
|
|
|
switch (pkttype)
|
|
|
|
{
|
|
|
|
case PKT_SIGNATURE:
|
2011-02-04 12:57:53 +01:00
|
|
|
case PKT_SECRET_KEY:
|
2004-08-24 19:55:47 +00:00
|
|
|
case PKT_PUBLIC_KEY:
|
|
|
|
case PKT_SECRET_SUBKEY:
|
|
|
|
case PKT_MARKER:
|
|
|
|
case PKT_RING_TRUST:
|
|
|
|
case PKT_USER_ID:
|
|
|
|
case PKT_PUBLIC_SUBKEY:
|
|
|
|
case PKT_OLD_COMMENT:
|
|
|
|
case PKT_ATTRIBUTE:
|
|
|
|
case PKT_COMMENT:
|
|
|
|
case PKT_GPG_CONTROL:
|
|
|
|
break; /* Okay these are allowed packets. */
|
|
|
|
default:
|
|
|
|
return gpg_error (GPG_ERR_UNEXPECTED);
|
|
|
|
}
|
|
|
|
|
2015-08-21 11:55:15 +02:00
|
|
|
if (pkttype == 63 && pktlen == 0xFFFFFFFF)
|
|
|
|
/* Sometimes the decompressing layer enters an error state in
|
|
|
|
which it simply outputs 0xff for every byte read. If we have a
|
|
|
|
stream of 0xff bytes, then it will be detected as a new format
|
|
|
|
packet with type 63 and a 4-byte encoded length that is 4G-1.
|
|
|
|
Since packets with type 63 are private and we use them as a
|
|
|
|
control packet, which won't be 4 GB, we reject such packets as
|
|
|
|
invalid. */
|
2011-04-28 20:21:14 +02:00
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
if (pktlen > len)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* Packet length header too long. */
|
|
|
|
|
|
|
|
*r_data = buf;
|
|
|
|
*r_datalen = pktlen;
|
|
|
|
*r_pkttype = pkttype;
|
|
|
|
*r_ntotal = (buf - *bufptr) + pktlen;
|
|
|
|
|
|
|
|
*bufptr = buf + pktlen;
|
|
|
|
*buflen = len - pktlen;
|
|
|
|
if (!*buflen)
|
|
|
|
*bufptr = NULL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-05 17:33:17 -08:00
|
|
|
/* Parse a key packet and store the information in KI. */
|
2004-08-24 19:55:47 +00:00
|
|
|
static gpg_error_t
|
|
|
|
parse_key (const unsigned char *data, size_t datalen,
|
|
|
|
struct _keybox_openpgp_key_info *ki)
|
|
|
|
{
|
|
|
|
gpg_error_t err;
|
|
|
|
const unsigned char *data_start = data;
|
|
|
|
int i, version, algorithm;
|
|
|
|
size_t n;
|
|
|
|
int npkey;
|
|
|
|
unsigned char hashbuffer[768];
|
|
|
|
const unsigned char *mpi_n = NULL;
|
|
|
|
size_t mpi_n_len = 0, mpi_e_len = 0;
|
|
|
|
gcry_md_hd_t md;
|
2011-04-28 20:21:14 +02:00
|
|
|
int is_ecc = 0;
|
2004-08-24 19:55:47 +00:00
|
|
|
|
|
|
|
if (datalen < 5)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
version = *data++; datalen--;
|
|
|
|
if (version < 2 || version > 4 )
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET); /* Invalid version. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2011-08-10 14:11:30 +02:00
|
|
|
/*timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));*/
|
2004-08-24 19:55:47 +00:00
|
|
|
data +=4; datalen -=4;
|
|
|
|
|
|
|
|
if (version < 4)
|
|
|
|
{
|
|
|
|
if (datalen < 2)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
data +=2; datalen -= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!datalen)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
algorithm = *data++; datalen--;
|
|
|
|
|
|
|
|
switch (algorithm)
|
|
|
|
{
|
2014-05-07 12:39:43 +02:00
|
|
|
case PUBKEY_ALGO_RSA:
|
|
|
|
case PUBKEY_ALGO_RSA_E:
|
|
|
|
case PUBKEY_ALGO_RSA_S:
|
2011-02-04 12:57:53 +01:00
|
|
|
npkey = 2;
|
2004-08-24 19:55:47 +00:00
|
|
|
break;
|
2014-05-07 12:39:43 +02:00
|
|
|
case PUBKEY_ALGO_ELGAMAL_E:
|
|
|
|
case PUBKEY_ALGO_ELGAMAL:
|
2004-08-24 19:55:47 +00:00
|
|
|
npkey = 3;
|
|
|
|
break;
|
2014-05-07 12:39:43 +02:00
|
|
|
case PUBKEY_ALGO_DSA:
|
2004-08-24 19:55:47 +00:00
|
|
|
npkey = 4;
|
|
|
|
break;
|
2014-05-07 12:39:43 +02:00
|
|
|
case PUBKEY_ALGO_ECDH:
|
2011-01-05 17:33:17 -08:00
|
|
|
npkey = 3;
|
2011-04-28 20:21:14 +02:00
|
|
|
is_ecc = 1;
|
2011-01-21 12:00:57 +01:00
|
|
|
break;
|
2014-05-07 12:39:43 +02:00
|
|
|
case PUBKEY_ALGO_ECDSA:
|
|
|
|
case PUBKEY_ALGO_EDDSA:
|
2011-01-05 17:33:17 -08:00
|
|
|
npkey = 2;
|
2011-04-28 20:21:14 +02:00
|
|
|
is_ecc = 1;
|
2011-01-05 17:33:17 -08:00
|
|
|
break;
|
2004-08-24 19:55:47 +00:00
|
|
|
default: /* Unknown algorithm. */
|
|
|
|
return gpg_error (GPG_ERR_UNKNOWN_ALGORITHM);
|
|
|
|
}
|
|
|
|
|
2012-12-28 13:45:41 +01:00
|
|
|
ki->algo = algorithm;
|
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
for (i=0; i < npkey; i++ )
|
|
|
|
{
|
|
|
|
unsigned int nbits, nbytes;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
if (datalen < 2)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
2011-04-28 20:21:14 +02:00
|
|
|
|
|
|
|
if (is_ecc && (i == 0 || i == 2))
|
2004-08-24 19:55:47 +00:00
|
|
|
{
|
2011-04-28 20:21:14 +02:00
|
|
|
nbytes = data[0];
|
|
|
|
if (nbytes < 2 || nbytes > 254)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
nbytes++; /* The size byte itself. */
|
|
|
|
if (datalen < nbytes)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nbits = ((data[0]<<8)|(data[1]));
|
|
|
|
data += 2;
|
|
|
|
datalen -= 2;
|
|
|
|
nbytes = (nbits+7) / 8;
|
|
|
|
if (datalen < nbytes)
|
|
|
|
return gpg_error (GPG_ERR_INV_PACKET);
|
|
|
|
/* For use by v3 fingerprint calculation we need to know the RSA
|
|
|
|
modulus and exponent. */
|
|
|
|
if (i==0)
|
|
|
|
{
|
|
|
|
mpi_n = data;
|
|
|
|
mpi_n_len = nbytes;
|
|
|
|
}
|
|
|
|
else if (i==1)
|
|
|
|
mpi_e_len = nbytes;
|
2004-08-24 19:55:47 +00:00
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
data += nbytes; datalen -= nbytes;
|
|
|
|
}
|
|
|
|
n = data - data_start;
|
|
|
|
|
|
|
|
if (version < 4)
|
|
|
|
{
|
|
|
|
/* We do not support any other algorithm than RSA in v3
|
|
|
|
packets. */
|
|
|
|
if (algorithm < 1 || algorithm > 3)
|
|
|
|
return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
|
|
|
|
|
|
|
|
err = gcry_md_open (&md, GCRY_MD_MD5, 0);
|
|
|
|
if (err)
|
|
|
|
return err; /* Oops */
|
|
|
|
gcry_md_write (md, mpi_n, mpi_n_len);
|
|
|
|
gcry_md_write (md, mpi_n+mpi_n_len+2, mpi_e_len);
|
|
|
|
memcpy (ki->fpr, gcry_md_read (md, 0), 16);
|
|
|
|
gcry_md_close (md);
|
|
|
|
ki->fprlen = 16;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
if (mpi_n_len < 8)
|
|
|
|
{
|
|
|
|
/* Moduli less than 64 bit are out of the specs scope. Zero
|
2011-04-28 20:21:14 +02:00
|
|
|
them out because this is what gpg does too. */
|
2011-02-04 12:57:53 +01:00
|
|
|
memset (ki->keyid, 0, 8);
|
2004-08-24 19:55:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
memcpy (ki->keyid, mpi_n + mpi_n_len - 8, 8);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Its a pitty that we need to prefix the buffer with the tag
|
2004-10-20 08:55:26 +00:00
|
|
|
and a length header: We can't simply pass it to the fast
|
2011-04-28 20:21:14 +02:00
|
|
|
hashing function for that reason. It might be a good idea to
|
2004-08-24 19:55:47 +00:00
|
|
|
have a scatter-gather enabled hash function. What we do here
|
|
|
|
is to use a static buffer if this one is large enough and
|
2011-04-28 20:21:14 +02:00
|
|
|
only use the regular hash functions if this buffer is not
|
2004-08-24 19:55:47 +00:00
|
|
|
large enough. */
|
|
|
|
if ( 3 + n < sizeof hashbuffer )
|
|
|
|
{
|
|
|
|
hashbuffer[0] = 0x99; /* CTB */
|
|
|
|
hashbuffer[1] = (n >> 8); /* 2 byte length header. */
|
|
|
|
hashbuffer[2] = n;
|
|
|
|
memcpy (hashbuffer + 3, data_start, n);
|
|
|
|
gcry_md_hash_buffer (GCRY_MD_SHA1, ki->fpr, hashbuffer, 3 + n);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
err = gcry_md_open (&md, GCRY_MD_SHA1, 0);
|
|
|
|
if (err)
|
|
|
|
return err; /* Oops */
|
|
|
|
gcry_md_putc (md, 0x99 ); /* CTB */
|
|
|
|
gcry_md_putc (md, (n >> 8) ); /* 2 byte length header. */
|
|
|
|
gcry_md_putc (md, n );
|
|
|
|
gcry_md_write (md, data_start, n);
|
|
|
|
memcpy (ki->fpr, gcry_md_read (md, 0), 20);
|
|
|
|
gcry_md_close (md);
|
|
|
|
}
|
|
|
|
ki->fprlen = 20;
|
|
|
|
memcpy (ki->keyid, ki->fpr+12, 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The caller must pass the address of an INFO structure which will
|
|
|
|
get filled on success with information pertaining to the OpenPGP
|
|
|
|
keyblock IMAGE of length IMAGELEN. Note that a caller does only
|
2011-04-28 20:21:14 +02:00
|
|
|
need to release this INFO structure if the function returns
|
2004-08-24 19:55:47 +00:00
|
|
|
success. If NPARSED is not NULL the actual number of bytes parsed
|
|
|
|
will be stored at this address. */
|
|
|
|
gpg_error_t
|
|
|
|
_keybox_parse_openpgp (const unsigned char *image, size_t imagelen,
|
2011-04-28 20:21:14 +02:00
|
|
|
size_t *nparsed, keybox_openpgp_info_t info)
|
2004-08-24 19:55:47 +00:00
|
|
|
{
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
const unsigned char *image_start, *data;
|
|
|
|
size_t n, datalen;
|
|
|
|
int pkttype;
|
|
|
|
int first = 1;
|
2011-04-28 20:21:14 +02:00
|
|
|
int read_error = 0;
|
2004-08-24 19:55:47 +00:00
|
|
|
struct _keybox_openpgp_key_info *k, **ktail = NULL;
|
|
|
|
struct _keybox_openpgp_uid_info *u, **utail = NULL;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
memset (info, 0, sizeof *info);
|
|
|
|
if (nparsed)
|
|
|
|
*nparsed = 0;
|
|
|
|
|
|
|
|
image_start = image;
|
|
|
|
while (image)
|
|
|
|
{
|
|
|
|
err = next_packet (&image, &imagelen, &data, &datalen, &pkttype, &n);
|
|
|
|
if (err)
|
2011-04-28 20:21:14 +02:00
|
|
|
{
|
|
|
|
read_error = 1;
|
|
|
|
break;
|
|
|
|
}
|
2004-08-24 19:55:47 +00:00
|
|
|
|
|
|
|
if (first)
|
|
|
|
{
|
|
|
|
if (pkttype == PKT_PUBLIC_KEY)
|
|
|
|
;
|
|
|
|
else if (pkttype == PKT_SECRET_KEY)
|
|
|
|
info->is_secret = 1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
err = gpg_error (GPG_ERR_UNEXPECTED);
|
2011-04-28 20:21:14 +02:00
|
|
|
if (nparsed)
|
|
|
|
*nparsed += n;
|
2004-08-24 19:55:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
first = 0;
|
|
|
|
}
|
|
|
|
else if (pkttype == PKT_PUBLIC_KEY || pkttype == PKT_SECRET_KEY)
|
|
|
|
break; /* Next keyblock encountered - ready. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
if (nparsed)
|
|
|
|
*nparsed += n;
|
|
|
|
|
|
|
|
if (pkttype == PKT_SIGNATURE)
|
|
|
|
{
|
|
|
|
/* For now we only count the total number of signatures. */
|
|
|
|
info->nsigs++;
|
|
|
|
}
|
|
|
|
else if (pkttype == PKT_USER_ID)
|
|
|
|
{
|
|
|
|
info->nuids++;
|
|
|
|
if (info->nuids == 1)
|
|
|
|
{
|
|
|
|
info->uids.off = data - image_start;
|
|
|
|
info->uids.len = datalen;
|
|
|
|
utail = &info->uids.next;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
u = xtrycalloc (1, sizeof *u);
|
|
|
|
if (!u)
|
|
|
|
{
|
2006-09-14 16:50:33 +00:00
|
|
|
err = gpg_error_from_syserror ();
|
2004-08-24 19:55:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
u->off = data - image_start;
|
|
|
|
u->len = datalen;
|
|
|
|
*utail = u;
|
|
|
|
utail = &u->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (pkttype == PKT_PUBLIC_KEY || pkttype == PKT_SECRET_KEY)
|
|
|
|
{
|
|
|
|
err = parse_key (data, datalen, &info->primary);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
else if( pkttype == PKT_PUBLIC_SUBKEY && datalen && *data == '#' )
|
2004-08-24 19:55:47 +00:00
|
|
|
{
|
|
|
|
/* Early versions of GnuPG used old PGP comment packets;
|
|
|
|
* luckily all those comments are prefixed by a hash
|
|
|
|
* sign - ignore these packets. */
|
|
|
|
}
|
|
|
|
else if (pkttype == PKT_PUBLIC_SUBKEY || pkttype == PKT_SECRET_SUBKEY)
|
|
|
|
{
|
|
|
|
info->nsubkeys++;
|
|
|
|
if (info->nsubkeys == 1)
|
|
|
|
{
|
|
|
|
err = parse_key (data, datalen, &info->subkeys);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
info->nsubkeys--;
|
|
|
|
/* We ignore subkeys with unknown algorithms. */
|
2011-04-28 20:21:14 +02:00
|
|
|
if (gpg_err_code (err) == GPG_ERR_UNKNOWN_ALGORITHM
|
|
|
|
|| gpg_err_code (err) == GPG_ERR_UNSUPPORTED_ALGORITHM)
|
|
|
|
err = 0;
|
|
|
|
if (err)
|
|
|
|
break;
|
2004-08-24 19:55:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
ktail = &info->subkeys.next;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
k = xtrycalloc (1, sizeof *k);
|
|
|
|
if (!k)
|
|
|
|
{
|
2006-09-14 16:50:33 +00:00
|
|
|
err = gpg_error_from_syserror ();
|
2004-08-24 19:55:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
err = parse_key (data, datalen, k);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
xfree (k);
|
|
|
|
info->nsubkeys--;
|
|
|
|
/* We ignore subkeys with unknown algorithms. */
|
2011-04-28 20:21:14 +02:00
|
|
|
if (gpg_err_code (err) == GPG_ERR_UNKNOWN_ALGORITHM
|
|
|
|
|| gpg_err_code (err) == GPG_ERR_UNSUPPORTED_ALGORITHM)
|
|
|
|
err = 0;
|
|
|
|
if (err)
|
|
|
|
break;
|
2004-08-24 19:55:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*ktail = k;
|
|
|
|
ktail = &k->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
_keybox_destroy_openpgp_info (info);
|
2011-04-28 20:21:14 +02:00
|
|
|
if (!read_error)
|
2004-08-24 19:55:47 +00:00
|
|
|
{
|
2011-04-28 20:21:14 +02:00
|
|
|
/* Packet parsing worked, thus we should be able to skip the
|
|
|
|
rest of the keyblock. */
|
2004-08-24 19:55:47 +00:00
|
|
|
while (image)
|
|
|
|
{
|
|
|
|
if (next_packet (&image, &imagelen,
|
|
|
|
&data, &datalen, &pkttype, &n) )
|
|
|
|
break; /* Another error - stop here. */
|
|
|
|
|
|
|
|
if (pkttype == PKT_PUBLIC_KEY || pkttype == PKT_SECRET_KEY)
|
|
|
|
break; /* Next keyblock encountered - ready. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-08-24 19:55:47 +00:00
|
|
|
if (nparsed)
|
|
|
|
*nparsed += n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Release any malloced data in INFO but not INFO itself! */
|
|
|
|
void
|
|
|
|
_keybox_destroy_openpgp_info (keybox_openpgp_info_t info)
|
|
|
|
{
|
|
|
|
struct _keybox_openpgp_key_info *k, *k2;
|
|
|
|
struct _keybox_openpgp_uid_info *u, *u2;
|
|
|
|
|
|
|
|
assert (!info->primary.next);
|
|
|
|
for (k=info->subkeys.next; k; k = k2)
|
|
|
|
{
|
|
|
|
k2 = k->next;
|
|
|
|
xfree (k);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (u=info->uids.next; u; u = u2)
|
|
|
|
{
|
|
|
|
u2 = u->next;
|
|
|
|
xfree (u);
|
|
|
|
}
|
|
|
|
}
|