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 d6d62e0e39ee31a25ab4d24718b7ecbd1f6d2215..0732a11156eae085c991428fa7f4bd75641be89c 100644
(file)
--- a/
keyindex.c
+++ b/
keyindex.c
@@
-3,7
+3,7
@@
*
* Jonathan McDowell <noodles@earth.li>
*
*
* Jonathan McDowell <noodles@earth.li>
*
- * Copyright 2002 Project Purple
+ * Copyright 2002
-2005
Project Purple
*/
#include <inttypes.h>
*/
#include <inttypes.h>
@@
-26,26
+26,37
@@
int list_sigs(struct openpgp_packet_list *sigs, bool html)
{
char *uid = NULL;
uint64_t sigid = 0;
{
char *uid = NULL;
uint64_t sigid = 0;
+ char *sig = NULL;
while (sigs != NULL) {
sigid = sig_keyid(sigs->packet);
uid = keyid2uid(sigid);
while (sigs != NULL) {
sigid = sig_keyid(sigs->packet);
uid = keyid2uid(sigid);
+ if (sigs->packet->data[0] == 4 &&
+ sigs->packet->data[1] == 0x30) {
+ /* It's a Type 4 sig revocation */
+ sig = "rev";
+ } else {
+ sig = "sig";
+ }
if (html && uid != NULL) {
if (html && uid != NULL) {
- printf("
sig
<a href=\"lookup?op=get&"
- "search=%0
8
llX\">%08llX</a> "
- "<a href=\"lookup?op=vindex&search=0x%0
8
llX\">"
+ printf("
%s
<a href=\"lookup?op=get&"
+ "search=%0
16
llX\">%08llX</a> "
+ "<a href=\"lookup?op=vindex&search=0x%0
16
llX\">"
"%s</a>\n",
"%s</a>\n",
+ sig,
+ sigid,
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
- sigid & 0xFFFFFFFF,
- sigid & 0xFFFFFFFF,
+ sigid,
txt2html(uid));
} else if (html && uid == NULL) {
txt2html(uid));
} else if (html && uid == NULL) {
- printf("
sig
%08llX "
+ printf("
%s
%08llX "
"[User id not found]\n",
"[User id not found]\n",
+ sig,
sigid & 0xFFFFFFFF);
} else {
sigid & 0xFFFFFFFF);
} else {
- printf("
sig
%08llX"
+ printf("
%s
%08llX"
" %s\n",
" %s\n",
+ sig,
sigid & 0xFFFFFFFF,
(uid != NULL) ? uid :
"[User id not found]");
sigid & 0xFFFFFFFF,
(uid != NULL) ? uid :
"[User id not found]");
@@
-220,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);
@@
-251,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,