X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=c708aa48642aada710f8589de1ae40883958c865;hb=e21d57328129d20ebef11143909ebc58bc0affce;hp=c043fa4cfdd1f293b69f42bf0bb75e6c721c8a02;hpb=abc90dd0602ca116ce61886e962aecd14d4459cc;p=onak.git
diff --git a/keyindex.c b/keyindex.c
index c043fa4..c708aa4 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -21,6 +21,7 @@
#include "keyindex.h"
#include "keystructs.h"
#include "log.h"
+#include "onak-conf.h"
int list_sigs(struct openpgp_packet_list *sigs, bool html)
{
@@ -30,7 +31,7 @@ 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 */
@@ -40,21 +41,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
}
if (html && uid != NULL) {
printf("%s %08llX "
- ""
- "%s\n",
+ "search=%016" PRIX64 "\">%08" PRIX64
+ " "
+ "%s\n",
sig,
+ sigid,
sigid & 0xFFFFFFFF,
- sigid & 0xFFFFFFFF,
- 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,
@@ -87,9 +89,11 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
} else if (uids->packet->tag == 17) {
printf(" ");
if (html) {
- printf("
\n",
- keyid,
- imgindx);
+ printf("
"
+ "\n",
+ keyid,
+ imgindx);
imgindx++;
} else {
printf("[photo id]\n");
@@ -231,25 +235,26 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keys->publickey->data[0]);
}
- keyid = (get_keyid(keys) & 0xFFFFFFFF);
+ keyid = get_keyid(keys);
if (html) {
printf("pub %5d%c/%08X %04d/%02d/%02d ",
+ "search=%016" PRIX64 "\">%08" PRIX64
+ " %04d/%02d/%02d ",
length,
(type == 1) ? 'R' : ((type == 16) ? 'g' :
((type == 17) ? 'D' : '?')),
- (uint32_t) keyid,
- (uint32_t) keyid,
+ keyid,
+ keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
} else {
- printf("pub %5d%c/%08X %04d/%02d/%02d ",
+ printf("pub %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
length,
(type == 1) ? 'R' : ((type == 16) ? 'g' :
((type == 17) ? 'D' : '?')),
- (uint32_t) keyid,
+ keyid & 0xFFFFFFFF,
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
@@ -262,14 +267,13 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
curuid->packet->data);
if (html) {
printf("",
- (uint32_t) keyid);
+ "search=0x%016" PRIX64 "\">",
+ keyid);
}
printf("%s%s%s\n",
(html) ? txt2html(buf) : buf,
(html) ? "" : "",
- (keys->revocations == NULL) ? "" :
- " *** REVOKED ***");
+ (keys->revoked) ? " *** REVOKED ***" : "");
if (fingerprint) {
display_fingerprint(keys);
}
@@ -279,8 +283,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
curuid = curuid->next;
} else {
printf("%s\n",
- (keys->revocations == NULL) ? "" :
- "*** REVOKED ***");
+ (keys->revoked) ? "*** REVOKED ***": "");
if (fingerprint) {
display_fingerprint(keys);
}
@@ -329,7 +332,7 @@ int mrkey_index(struct openpgp_publickey *keys)
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];
@@ -354,7 +357,7 @@ int mrkey_index(struct openpgp_publickey *keys)
type,
length,
created_time,
- (keys->revocations == NULL) ? "" : "r");
+ (keys->revoked) ? "r" : "");
for (curuid = keys->uids; curuid != NULL;
curuid = curuid->next) {