Add support for displaying EC/ECDSA key types

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index 6aab5d3c73da891faeebe6d3262d3420a464fead..8800d88e84576ab164381962624105cb010755eb 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -2,6 +2,19 @@
  * keyindex.c - Routines to list an OpenPGP key.
  *
  * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <inttypes.h>
@@ -19,9 +32,50 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "log.h"
+#include "onak.h"
 #include "onak-conf.h"
 #include "openpgp.h"
 
+/*
+ * Convert a Public Key algorithm to its single character representation.
+ */
+char pkalgo2char(uint8_t algo)
+{
+       char typech;
+
+       switch (algo) {
+       case OPENPGP_PKALGO_DSA:
+               typech = 'D';
+               break;
+       case OPENPGP_PKALGO_ECDSA:
+               typech = 'E';
+               break;
+       case OPENPGP_PKALGO_EC:
+               typech = 'e';
+               break;
+       case OPENPGP_PKALGO_ELGAMAL_SIGN:
+               typech = 'G';
+               break;
+       case OPENPGP_PKALGO_ELGAMAL_ENC:
+               typech = 'g';
+               break;
+       case OPENPGP_PKALGO_RSA:
+               typech = 'R';
+               break;
+       case OPENPGP_PKALGO_RSA_ENC:
+               typech = 'r';
+               break;
+       case OPENPGP_PKALGO_RSA_SIGN:
+               typech = 's';
+               break;
+       default:
+               typech = '?';
+               break;
+       }
+
+       return typech;
+}
+
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
        char *uid = NULL;
@@ -40,7 +94,7 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"
-                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "search=0x%016" PRIX64 "\">%08" PRIX64
                                "</a>             "
                                "<a href=\"lookup?op=vindex&search=0x%016"
                                PRIX64 "\">%s</a>\n",
@@ -114,6 +168,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) {
@@ -141,14 +196,15 @@ 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_DSA) ? 'D' : '?')),
-                               (uint32_t) (get_packetid(subkeys->packet) &
-                                           0xFFFFFFFF),
+                               pkalgo2char(type),
+                               (uint32_t) (keyid & 0xFFFFFFFF),
                                created->tm_year + 1900,
                                created->tm_mon + 1,
                                created->tm_mday);
@@ -176,10 +232,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");
 
@@ -228,7 +285,6 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
        struct tm                               *created = NULL;
        time_t                                   created_time = 0;
        int                                      type = 0;
-       char                                     typech;
        int                                      length = 0;
        char                                     buf[1024];
        uint64_t                                 keyid;
@@ -261,32 +317,16 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                                keys->publickey->data[0]);
                }
                
-               keyid = get_keyid(keys);
-
-               switch (type) {
-               case OPENPGP_PKALGO_RSA:
-                       typech = 'R';
-                       break;
-               case OPENPGP_PKALGO_ELGAMAL:
-                       typech = 'g';
-                       break;
-               case OPENPGP_PKALGO_DSA:
-                       typech = 'D';
-                       break;
-               case OPENPGP_PKALGO_ELGAMAL_SIGN:
-                       typech = 'G';
-                       break;
-               default:
-                       typech = '?';
-                       break;
+               if (get_keyid(keys, &keyid) != ONAK_E_OK) {
+                       logthing(LOGTHING_ERROR, "Couldn't get keyid.");
                }
 
                if (html) {
                        printf("pub  %5d%c/<a href=\"lookup?op=get&"
-                               "search=%016" PRIX64 "\">%08" PRIX64
+                               "search=0x%016" PRIX64 "\">%08" PRIX64
                                "</a> %04d/%02d/%02d ",
                                length,
-                               typech,
+                               pkalgo2char(type),
                                keyid,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
@@ -295,7 +335,7 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                } else {
                        printf("pub  %5d%c/%08" PRIX64 " %04d/%02d/%02d ",
                                length,
-                               typech,
+                               pkalgo2char(type),
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
@@ -367,6 +407,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) +
@@ -379,7 +420,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];