projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle signature revokations better.
[onak.git]
/
keyindex.c
diff --git
a/keyindex.c
b/keyindex.c
index d6d62e0e39ee31a25ab4d24718b7ecbd1f6d2215..c043fa4cfdd1f293b69f42bf0bb75e6c721c8a02 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&"
+ printf("
%s
<a href=\"lookup?op=get&"
"search=%08llX\">%08llX</a> "
"<a href=\"lookup?op=vindex&search=0x%08llX\">"
"%s</a>\n",
"search=%08llX\">%08llX</a> "
"<a href=\"lookup?op=vindex&search=0x%08llX\">"
"%s</a>\n",
+ sig,
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
txt2html(uid));
} else if (html && uid == NULL) {
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
sigid & 0xFFFFFFFF,
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]");