X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5e1b22d763640c4d7a09d07920403d8d491b4410..94ffe75fd3251c74320167cf94604e73fdb99dfc:/keyindex.c
diff --git a/keyindex.c b/keyindex.c
index eee2e8a..46e778c 100644
--- a/keyindex.c
+++ b/keyindex.c
@@ -32,6 +32,7 @@
#include "keyindex.h"
#include "keystructs.h"
#include "log.h"
+#include "onak.h"
#include "onak-conf.h"
#include "openpgp.h"
@@ -53,7 +54,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
}
if (html && uid != NULL) {
printf("%s %08" PRIX64
+ "search=0x%016" PRIX64 "\">%08" PRIX64
" "
"%s\n",
@@ -127,6 +128,7 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
time_t created_time = 0;
int type = 0;
int length = 0;
+ uint64_t keyid = 0;
while (subkeys != NULL) {
if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
@@ -154,14 +156,17 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
"Unknown key type: %d",
subkeys->packet->data[0]);
}
-
+
+ if (get_packetid(subkeys->packet,
+ &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid.");
+ }
printf("sub %5d%c/%08X %04d/%02d/%02d\n",
length,
(type == OPENPGP_PKALGO_RSA) ? 'R' :
- ((type == OPENPGP_PKALGO_ELGAMAL) ? 'g' :
+ ((type == OPENPGP_PKALGO_ELGAMAL_ENC) ? 'g' :
((type == OPENPGP_PKALGO_DSA) ? 'D' : '?')),
- (uint32_t) (get_packetid(subkeys->packet) &
- 0xFFFFFFFF),
+ (uint32_t) (keyid & 0xFFFFFFFF),
created->tm_year + 1900,
created->tm_mon + 1,
created->tm_mday);
@@ -189,10 +194,11 @@ void display_fingerprint(struct openpgp_publickey *key)
(i % 2 == 0)) {
printf(" ");
}
- printf("%02X", fp[i]);
- if ((i * 2) == length) {
+ if (length == 20 && (i * 2) == length) {
+ /* Extra space in the middle of a SHA1 fingerprint */
printf(" ");
}
+ printf("%02X", fp[i]);
}
printf("\n");
@@ -274,13 +280,15 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
keys->publickey->data[0]);
}
- keyid = get_keyid(keys);
+ if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid.");
+ }
switch (type) {
case OPENPGP_PKALGO_RSA:
typech = 'R';
break;
- case OPENPGP_PKALGO_ELGAMAL:
+ case OPENPGP_PKALGO_ELGAMAL_ENC:
typech = 'g';
break;
case OPENPGP_PKALGO_DSA:
@@ -296,7 +304,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
if (html) {
printf("pub %5d%c/%08" PRIX64
+ "search=0x%016" PRIX64 "\">%08" PRIX64
" %04d/%02d/%02d ",
length,
typech,
@@ -380,6 +388,7 @@ int mrkey_index(struct openpgp_publickey *keys)
size_t fplength = 0;
unsigned char fp[20];
int c;
+ uint64_t keyid;
while (keys != NULL) {
created_time = (keys->publickey->data[1] << 24) +
@@ -392,7 +401,10 @@ int mrkey_index(struct openpgp_publickey *keys)
switch (keys->publickey->data[0]) {
case 2:
case 3:
- printf("%016" PRIX64, get_keyid(keys));
+ if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+ logthing(LOGTHING_ERROR, "Couldn't get keyid");
+ }
+ printf("%016" PRIX64, keyid);
type = keys->publickey->data[7];
length = (keys->publickey->data[8] << 8) +
keys->publickey->data[9];