X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyindex.c;h=6aab5d3c73da891faeebe6d3262d3420a464fead;hb=0211c730256c9bbaf10a569c88f7df0ef882311e;hp=0cc9edd89e1bb20da6966646f6837035ea06b5c0;hpb=936be87217c58254edc92aa63178fa0461f67150;p=onak.git
diff --git a/keyindex.c b/keyindex.c
index 0cc9edd..6aab5d3 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -20,6 +20,7 @@
#include "keystructs.h"
#include "log.h"
#include "onak-conf.h"
+#include "openpgp.h"
int list_sigs(struct openpgp_packet_list *sigs, bool html)
{
@@ -78,13 +79,13 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
int imgindx = 0;
while (uids != NULL) {
- if (uids->packet->tag == 13) {
+ if (uids->packet->tag == OPENPGP_PACKET_UID) {
snprintf(buf, 1023, "%.*s",
(int) uids->packet->length,
uids->packet->data);
printf(" %s\n",
(html) ? txt2html(buf) : buf);
- } else if (uids->packet->tag == 17) {
+ } else if (uids->packet->tag == OPENPGP_PACKET_UAT) {
printf(" ");
if (html) {
printf("packet->tag == 14) {
+ if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
created_time = (subkeys->packet->data[1] << 24) +
(subkeys->packet->data[2] << 16) +
@@ -143,8 +144,9 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
printf("sub %5d%c/%08X %04d/%02d/%02d\n",
length,
- (type == 1) ? 'R' : ((type == 16) ? 'g' :
- ((type == 17) ? 'D' : '?')),
+ (type == OPENPGP_PKALGO_RSA) ? 'R' :
+ ((type == OPENPGP_PKALGO_ELGAMAL) ? 'g' :
+ ((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
(uint32_t) (get_packetid(subkeys->packet) &
0xFFFFFFFF),
created->tm_year + 1900,
@@ -184,6 +186,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,7 +222,7 @@ 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;
@@ -237,16 +264,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keyid = get_keyid(keys);
switch (type) {
- case 1:
+ case OPENPGP_PKALGO_RSA:
typech = 'R';
break;
- case 16:
+ case OPENPGP_PKALGO_ELGAMAL:
typech = 'g';
break;
- case 17:
+ case OPENPGP_PKALGO_DSA:
typech = 'D';
break;
- case 20:
+ case OPENPGP_PKALGO_ELGAMAL_SIGN:
typech = 'G';
break;
default:
@@ -276,7 +303,8 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
}
curuid = keys->uids;
- if (curuid != NULL && curuid->packet->tag == 13) {
+ if (curuid != NULL &&
+ curuid->packet->tag == OPENPGP_PACKET_UID) {
snprintf(buf, 1023, "%.*s",
(int) curuid->packet->length,
curuid->packet->data);
@@ -289,6 +317,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);
}
@@ -378,7 +409,7 @@ int mrkey_index(struct openpgp_publickey *keys)
for (curuid = keys->uids; curuid != NULL;
curuid = curuid->next) {
- if (curuid->packet->tag == 13) {
+ if (curuid->packet->tag == OPENPGP_PACKET_UID) {
printf("uid:");
for (i = 0; i < (int) curuid->packet->length;
i++) {