X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/d27407c824b63bd0b9c78479453c3ce4799afac8..5d25774c5cd9f80709f852f79bce26d582fad360:/keyindex.c
diff --git a/keyindex.c b/keyindex.c
index fead60b..869befd 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -87,9 +87,9 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
} else if (uids->packet->tag == 17) {
printf(" ");
if (html) {
- printf(""
- "\n",
+ printf("\n",
keyid,
imgindx);
imgindx++;
@@ -184,6 +184,31 @@ void display_fingerprint(struct openpgp_publickey *key)
return;
}
+void display_skshash(struct openpgp_publickey *key, bool html)
+{
+ int i = 0;
+ struct skshash hash;
+
+ get_skshash(key, &hash);
+ printf(" Key hash = ");
+ if (html) {
+ printf("");
+ }
+ for (i = 0; i < sizeof(hash.hash); i++) {
+ printf("%02X", hash.hash[i]);
+ }
+ if (html) {
+ printf("");
+ }
+ printf("\n");
+
+ return;
+}
+
/**
* key_index - List a set of OpenPGP keys.
* @keys: The keys to display.
@@ -195,12 +220,13 @@ void display_fingerprint(struct openpgp_publickey *key)
* of them. Useful for debugging or the keyserver Index function.
*/
int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
- bool html)
+ bool skshash, bool html)
{
struct openpgp_signedpacket_list *curuid = NULL;
struct tm *created = NULL;
time_t created_time = 0;
int type = 0;
+ char typech;
int length = 0;
char buf[1024];
uint64_t keyid;
@@ -235,13 +261,30 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
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/%08" PRIX64
" %04d/%02d/%02d ",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ typech,
keyid,
keyid & 0xFFFFFFFF,
created->tm_year + 1900,
@@ -250,8 +293,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
} else {
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,
@@ -272,6 +314,9 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
(html) ? txt2html(buf) : buf,
(html) ? "" : "",
(keys->revoked) ? " *** REVOKED ***" : "");
+ if (skshash) {
+ display_skshash(keys, html);
+ }
if (fingerprint) {
display_fingerprint(keys);
}