/*
* keyindex.c - Routines to list an OpenPGP key.
*
- * Jonathan McDowell <noodles@earth.li>
- *
- * Copyright 2002-2005 Project Purple
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
*/
#include <inttypes.h>
#include "keyindex.h"
#include "keystructs.h"
#include "log.h"
+#include "onak-conf.h"
int list_sigs(struct openpgp_packet_list *sigs, bool html)
{
while (sigs != NULL) {
sigid = sig_keyid(sigs->packet);
- uid = keyid2uid(sigid);
+ uid = config.dbbackend->keyid2uid(sigid);
if (sigs->packet->data[0] == 4 &&
sigs->packet->data[1] == 0x30) {
/* It's a Type 4 sig revocation */
}
if (html && uid != NULL) {
printf("%s <a href=\"lookup?op=get&"
- "search=%016llX\">%08llX</a> "
- "<a href=\"lookup?op=vindex&search=0x%016llX\">"
- "%s</a>\n",
+ "search=%016" PRIX64 "\">%08" PRIX64
+ "</a> "
+ "<a href=\"lookup?op=vindex&search=0x%016"
+ PRIX64 "\">%s</a>\n",
sig,
sigid,
sigid & 0xFFFFFFFF,
sigid,
txt2html(uid));
} else if (html && uid == NULL) {
- printf("%s %08llX "
+ printf("%s %08" PRIX64 " "
"[User id not found]\n",
sig,
sigid & 0xFFFFFFFF);
} else {
- printf("%s %08llX"
+ printf("%s %08" PRIX64
" %s\n",
sig,
sigid & 0xFFFFFFFF,
} else if (uids->packet->tag == 17) {
printf(" ");
if (html) {
- printf("<img src=\"lookup?op=photo&search=0x%llX&idx=%d\" alt=\"[photo id]\">\n",
- keyid,
- imgindx);
+ printf("<img src=\"lookup?op=photo&search="
+ "0x%016" PRIX64 "&idx=%d\" alt=\""
+ "[photo id]\">\n",
+ keyid,
+ imgindx);
imgindx++;
} else {
printf("[photo id]\n");
struct tm *created = NULL;
time_t created_time = 0;
int type = 0;
+ char typech;
int length = 0;
char buf[1024];
uint64_t keyid;
keyid = get_keyid(keys);
+ switch (type) {
+ case 1:
+ typech = 'R';
+ break;
+ case 16:
+ typech = 'g';
+ break;
+ case 17:
+ typech = 'D';
+ break;
+ case 20:
+ typech = 'G';
+ break;
+ default:
+ typech = '?';
+ break;
+ }
+
if (html) {
printf("pub %5d%c/<a href=\"lookup?op=get&"
- "search=%016llX\">%08llX</a> %04d/%02d/%02d ",
+ "search=%016" PRIX64 "\">%08" PRIX64
+ "</a> %04d/%02d/%02d ",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ typech,
keyid,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
} else {
- printf("pub %5d%c/%08llX %04d/%02d/%02d ",
+ printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ typech,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,
curuid->packet->data);
if (html) {
printf("<a href=\"lookup?op=vindex&"
- "search=0x%016llX\">",
+ "search=0x%016" PRIX64 "\">",
keyid);
}
printf("%s%s%s\n",
int i = 0;
size_t fplength = 0;
unsigned char fp[20];
+ int c;
while (keys != NULL) {
created_time = (keys->publickey->data[1] << 24) +
switch (keys->publickey->data[0]) {
case 2:
case 3:
- printf("%016llX", get_keyid(keys));
+ printf("%016" PRIX64, get_keyid(keys));
type = keys->publickey->data[7];
length = (keys->publickey->data[8] << 8) +
keys->publickey->data[9];
curuid = curuid->next) {
if (curuid->packet->tag == 13) {
- printf("uid:%.*s\n",
- (int) curuid->packet->length,
- curuid->packet->data);
+ printf("uid:");
+ for (i = 0; i < (int) curuid->packet->length;
+ i++) {
+ c = curuid->packet->data[i];
+ if (c == '%') {
+ putchar('%');
+ putchar(c);
+ } else if (c == ':' || c > 127) {
+ printf("%%%X", c);
+ } else {
+ putchar(c);
+ }
+ }
+ printf("\n");
}
}
keys = keys->next;