From: Jonathan McDowell Date: Mon, 31 May 2004 23:48:10 +0000 (+0000) Subject: cscvs to tla changeset 114 X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/0b0581faefe375851f86176733b9bd2a5ef3c2bb cscvs to tla changeset 114 Author: noodles Date: 2003/11/01 19:25:15 Relax restriction on Type 3 keys being RSA - log the fact, but don't error. --- diff --git a/keyid.c b/keyid.c index 8cf32ba..95b5dd4 100644 --- a/keyid.c +++ b/keyid.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: keyid.c,v 1.7 2003/06/04 20:57:09 noodles Exp $ + * $Id: keyid.c,v 1.8 2003/11/01 19:25:15 noodles Exp $ */ #include @@ -125,21 +125,25 @@ uint64_t get_packetid(struct openpgp_packet *packet) * For a type 2 or 3 key the keyid is the last 64 bits of the * public modulus n, which is stored as an MPI from offset 8 * onwards. - * - * We need to ensure it's an RSA key. */ - if (packet->data[7] == 1) { - offset = (packet->data[8] << 8) + - packet->data[9]; - offset = ((offset + 7) / 8) + 2; - - for (keyid = 0, i = 0; i < 8; i++) { - keyid <<= 8; - keyid += packet->data[offset++]; - } - } else { - logthing(LOGTHING_ERROR, - "Type 2 or 3 key, but not RSA."); + offset = (packet->data[8] << 8) + + packet->data[9]; + offset = ((offset + 7) / 8) + 2; + + for (keyid = 0, i = 0; i < 8; i++) { + keyid <<= 8; + keyid += packet->data[offset++]; + } + /* + * I thought we needed to ensure it's an RSA key, but pks + * doesn't seem to care and I've seen some type 3 keys. + * So just log a warning. + */ + if (packet->data[7] != 1) { + logthing(LOGTHING_NOTICE, + "Type 2 or 3 key, but not RSA: %llx (type %d)", + keyid, + packet->data[7]); } break; case 4: