projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support 16 digit key ids in lookup.
[onak.git]
/
keyindex.c
diff --git
a/keyindex.c
b/keyindex.c
index c043fa4cfdd1f293b69f42bf0bb75e6c721c8a02..0732a11156eae085c991428fa7f4bd75641be89c 100644
(file)
--- a/
keyindex.c
+++ b/
keyindex.c
@@
-40,13
+40,13
@@
int list_sigs(struct openpgp_packet_list *sigs, bool html)
}
if (html && uid != NULL) {
printf("%s <a href=\"lookup?op=get&"
}
if (html && uid != NULL) {
printf("%s <a href=\"lookup?op=get&"
- "search=%0
8
llX\">%08llX</a> "
- "<a href=\"lookup?op=vindex&search=0x%0
8
llX\">"
+ "search=%0
16
llX\">%08llX</a> "
+ "<a href=\"lookup?op=vindex&search=0x%0
16
llX\">"
"%s</a>\n",
sig,
"%s</a>\n",
sig,
+ sigid,
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
- sigid & 0xFFFFFFFF,
- sigid & 0xFFFFFFFF,
+ sigid,
txt2html(uid));
} else if (html && uid == NULL) {
printf("%s %08llX "
txt2html(uid));
} else if (html && uid == NULL) {
printf("%s %08llX "
@@
-231,25
+231,25
@@
int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keys->publickey->data[0]);
}
keys->publickey->data[0]);
}
- keyid =
(get_keyid(keys) & 0xFFFFFFFF
);
+ keyid =
get_keyid(keys
);
if (html) {
printf("pub %5d%c/<a href=\"lookup?op=get&"
if (html) {
printf("pub %5d%c/<a href=\"lookup?op=get&"
- "search=%0
8X\">%08
X</a> %04d/%02d/%02d ",
+ "search=%0
16llX\">%08ll
X</a> %04d/%02d/%02d ",
length,
(type == 1) ? 'R' : ((type == 16) ? 'g' :
((type == 17) ? 'D' : '?')),
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 {
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
ll
X %04d/%02d/%02d ",
length,
(type == 1) ? 'R' : ((type == 16) ? 'g' :
((type == 17) ? 'D' : '?')),
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);
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
@@
-262,8
+262,8
@@
int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
curuid->packet->data);
if (html) {
printf("<a href=\"lookup?op=vindex&"
curuid->packet->data);
if (html) {
printf("<a href=\"lookup?op=vindex&"
- "search=0x%0
8
X\">",
-
(uint32_t)
keyid);
+ "search=0x%0
16ll
X\">",
+ keyid);
}
printf("%s%s%s\n",
(html) ? txt2html(buf) : buf,
}
printf("%s%s%s\n",
(html) ? txt2html(buf) : buf,