* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* slower than custom functions however.
*/
+#include <stdbool.h>
#include <stdio.h>
#include "decodekey.h"
#include "keydb.h"
#include "keyid.h"
#include "keystructs.h"
+#include "ll.h"
#include "mem.h"
#include "merge.h"
#include "openpgp.h"
-#include "parsekey.h"
#include "sendsync.h"
+#include "stats.h"
#ifdef NEED_KEYID2UID
/**
{
struct ll *sigs = NULL;
struct openpgp_signedpacket_list *uids = NULL;
+ struct openpgp_packet_list *cursig;
struct openpgp_publickey *publickey = NULL;
dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
if (publickey != NULL) {
for (uids = publickey->uids; uids != NULL; uids = uids->next) {
- sigs = keysigs(sigs, uids->sigs);
+ for (cursig = uids->sigs; cursig != NULL;
+ cursig = cursig->next) {
+ sigs = lladd(sigs,
+ createandaddtohash(sig_keyid(
+ cursig->packet)));
+ }
}
if (revoked != NULL) {
*revoked = publickey->revoked;
struct openpgp_publickey *curkey = NULL;
struct openpgp_publickey *oldkey = NULL;
struct openpgp_publickey *prev = NULL;
+ struct openpgp_fingerprint fp;
int newkeys = 0;
bool intrans;
- uint64_t keyid;
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
intrans = dbctx->starttrans(dbctx);
- get_keyid(curkey, &keyid);
+ get_fingerprint(curkey->publickey, &fp);
logthing(LOGTHING_INFO,
- "Fetching key 0x%" PRIX64 ", result: %d",
- keyid,
- dbctx->fetch_key_id(dbctx, keyid, &oldkey,
+ "Fetching key, result: %d",
+ dbctx->fetch_key_fp(dbctx, &fp, &oldkey,
intrans));
/*
/*
* We assume if the backend is using this function it's not storing
* anything bigger than the 64 bit key ID and just truncate the
- * fingerprint to get that value. This doesn't work for v3 keys,
+ * fingerprint to get that value. v4 keys want the lowest 64 bits, v5
+ * keys need the top 64 bits. This doesn't work for v3 keys,
* but there's no way to map from v3 fingerprint to v3 key ID so
* if the backend can't do it we're going to fail anyway.
*/
keyid = 0;
- for (i = (fingerprint->length - 8); i < fingerprint->length; i++) {
- keyid = (keyid << 8) + fingerprint->fp[i];
+ if (fingerprint->length == 20) {
+ /* v4 */
+ for (i = (fingerprint->length - 8); i < fingerprint->length;
+ i++) {
+ keyid = (keyid << 8) + fingerprint->fp[i];
+ }
+ } else {
+ /* v5 */
+ for (i = 0; i < 8; i++) {
+ keyid = (keyid << 8) + fingerprint->fp[i];
+ }
}
return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);