#include "keystructs.h"
#include "log.h"
#include "onak-conf.h"
+#include "openpgp.h"
int list_sigs(struct openpgp_packet_list *sigs, bool html)
{
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("<img src=\"lookup?op=photo&search=0x%"
- PRIX64 "&idx=%d\" alt=\"[photo id]\">"
- "\n",
+ printf("<img src=\"lookup?op=photo&search="
+ "0x%016" PRIX64 "&idx=%d\" alt=\""
+ "[photo id]\">\n",
keyid,
imgindx);
imgindx++;
int length = 0;
while (subkeys != NULL) {
- if (subkeys->packet->tag == 14) {
+ if (subkeys->packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
created_time = (subkeys->packet->data[1] << 24) +
(subkeys->packet->data[2] << 16) +
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,
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("<a href=\"lookup?op=hget&search=");
+ for (i = 0; i < sizeof(hash.hash); i++) {
+ printf("%02X", hash.hash[i]);
+ }
+ printf("\">");
+ }
+ for (i = 0; i < sizeof(hash.hash); i++) {
+ printf("%02X", hash.hash[i]);
+ }
+ if (html) {
+ printf("</a>");
+ }
+ printf("\n");
+
+ return;
+}
+
/**
* key_index - List a set of OpenPGP keys.
* @keys: The keys to display.
* 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;
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:
}
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);
(html) ? txt2html(buf) : buf,
(html) ? "</a>" : "",
(keys->revoked) ? " *** REVOKED ***" : "");
+ if (skshash) {
+ display_skshash(keys, html);
+ }
if (fingerprint) {
display_fingerprint(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++) {