Clean up "set but not used" GCC warnings

[onak.git] / keyindex.c

diff --git a/keyindex.c b/keyindex.c
index e4649ba041fd0ed2f914a06189224ac143456264..eee2e8a6f867415c3651c5c5d57f0b00424d00ae 100644 (file)
--- a/keyindex.c
+++ b/keyindex.c
@@ -1,9 +1,20 @@
 /*
  * keyindex.c - Routines to list an OpenPGP key.
  *
 /*
  * keyindex.c - Routines to list an OpenPGP key.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2008 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002-2005 Project Purple
+ * 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>
  */
 
 #include <inttypes.h>


@@ -22,6 +33,7 @@
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"

+#include "openpgp.h"

 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {
 
 int list_sigs(struct openpgp_packet_list *sigs, bool html)
 {


@@ -41,22 +53,22 @@ int list_sigs(struct openpgp_packet_list *sigs, bool html)
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"
                }
                if (html && uid != NULL) {
                        printf("%s         <a href=\"lookup?op=get&"

-                               "search=%016" PRIx64 "\">%08" PRIx64
+                               "search=%016" PRIX64 "\">%08" PRIX64

                                "</a>             "
                                "<a href=\"lookup?op=vindex&search=0x%016"
                                "</a>             "
                                "<a href=\"lookup?op=vindex&search=0x%016"

-                               PRIx64 "\">%s</a>\n",
+                               PRIX64 "\">%s</a>\n",

                                sig,
                                sigid,
                                sigid & 0xFFFFFFFF,
                                sigid,
                                txt2html(uid));
                } else if (html && uid == NULL) {
                                sig,
                                sigid,
                                sigid & 0xFFFFFFFF,
                                sigid,
                                txt2html(uid));
                } else if (html && uid == NULL) {

-                       printf("%s         %08" PRIx64 "             "
+                       printf("%s         %08" PRIX64 "             "

                                "[User id not found]\n",
                                sig,
                                sigid & 0xFFFFFFFF);
                } else {
                                "[User id not found]\n",
                                sig,
                                sigid & 0xFFFFFFFF);
                } else {

-                       printf("%s         %08" PRIx64
+                       printf("%s         %08" PRIX64

                                "             %s\n",
                                sig,
                                sigid & 0xFFFFFFFF,
                                "             %s\n",
                                sig,
                                sigid & 0xFFFFFFFF,


@@ -80,18 +92,18 @@ int list_uids(uint64_t keyid, struct openpgp_signedpacket_list *uids,
        int  imgindx = 0;
 
        while (uids != NULL) {
        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);
                        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("                                ");
                        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++;
                                        keyid,
                                        imgindx);
                                imgindx++;


@@ -117,7 +129,7 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
        int             length = 0;
 
        while (subkeys != NULL) {
        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) +
 
                        created_time = (subkeys->packet->data[1] << 24) +
                                        (subkeys->packet->data[2] << 16) +


@@ -145,8 +157,9 @@ int list_subkeys(struct openpgp_signedpacket_list *subkeys, bool verbose,
                
                        printf("sub  %5d%c/%08X %04d/%02d/%02d\n",
                                length,
                
                        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,
                                (uint32_t) (get_packetid(subkeys->packet) &
                                            0xFFFFFFFF),
                                created->tm_year + 1900,


@@ -186,6 +199,31 @@ void display_fingerprint(struct openpgp_publickey *key)
        return;
 }
 
        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.
 /**
  *     key_index - List a set of OpenPGP keys.
  *     @keys: The keys to display.


@@ -197,12 +235,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,
  *     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;
 {
        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;
        int                                      length = 0;
        char                                     buf[1024];
        uint64_t                                 keyid;


@@ -237,23 +276,39 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                
                keyid = get_keyid(keys);
 
                
                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 (html) {
                        printf("pub  %5d%c/<a href=\"lookup?op=get&"
                if (html) {
                        printf("pub  %5d%c/<a href=\"lookup?op=get&"

-                               "search=%016" PRIx64 "\">%08" PRIx64
+                               "search=%016" PRIX64 "\">%08" PRIX64

                                "</a> %04d/%02d/%02d ",
                                length,
                                "</a> %04d/%02d/%02d ",
                                length,

-                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
-                                       ((type == 17) ? 'D' : '?')),
+                               typech,

                                keyid,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
                                created->tm_mday);
                } else {
                                keyid,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
                                created->tm_mday);
                } else {

-                       printf("pub  %5d%c/%08" PRIx64 " %04d/%02d/%02d ",
+                       printf("pub  %5d%c/%08" PRIX64 " %04d/%02d/%02d ",

                                length,
                                length,

-                               (type == 1) ? 'R' : ((type == 16) ? 'g' : 
-                                       ((type == 17) ? 'D' : '?')),
+                               typech,

                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,
                                keyid & 0xFFFFFFFF,
                                created->tm_year + 1900,
                                created->tm_mon + 1,


@@ -261,19 +316,23 @@ int key_index(struct openpgp_publickey *keys, bool verbose, bool fingerprint,
                }
 
                curuid = keys->uids;
                }
 
                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);
                        if (html) {
                                printf("<a href=\"lookup?op=vindex&"
                        snprintf(buf, 1023, "%.*s",
                                (int) curuid->packet->length,
                                curuid->packet->data);
                        if (html) {
                                printf("<a href=\"lookup?op=vindex&"

-                                       "search=0x%016" PRIx64 "\">",
+                                       "search=0x%016" PRIX64 "\">",

                                        keyid);
                        }
                        printf("%s%s%s\n", 
                                (html) ? txt2html(buf) : buf,
                                (html) ? "</a>" : "",
                                (keys->revoked) ? " *** REVOKED ***" : "");
                                        keyid);
                        }
                        printf("%s%s%s\n", 
                                (html) ? txt2html(buf) : buf,
                                (html) ? "</a>" : "",
                                (keys->revoked) ? " *** REVOKED ***" : "");

+                       if (skshash) {
+                               display_skshash(keys, html);
+                       }

                        if (fingerprint) {
                                display_fingerprint(keys);
                        }
                        if (fingerprint) {
                                display_fingerprint(keys);
                        }


@@ -320,6 +379,7 @@ int mrkey_index(struct openpgp_publickey *keys)
        int                                      i = 0;
        size_t                                   fplength = 0;
        unsigned char                            fp[20];
        int                                      i = 0;
        size_t                                   fplength = 0;
        unsigned char                            fp[20];

+       int                                      c;

 
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +
 
        while (keys != NULL) {
                created_time = (keys->publickey->data[1] << 24) +


@@ -332,7 +392,7 @@ int mrkey_index(struct openpgp_publickey *keys)
                switch (keys->publickey->data[0]) {
                case 2:
                case 3:
                switch (keys->publickey->data[0]) {
                case 2:
                case 3:

-                       printf("%016" PRIx64, get_keyid(keys));
+                       printf("%016" PRIX64, get_keyid(keys));

                        type = keys->publickey->data[7];
                        length = (keys->publickey->data[8] << 8) +
                                        keys->publickey->data[9];
                        type = keys->publickey->data[7];
                        length = (keys->publickey->data[8] << 8) +
                                        keys->publickey->data[9];


@@ -362,10 +422,21 @@ int mrkey_index(struct openpgp_publickey *keys)
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {
                
                for (curuid = keys->uids; curuid != NULL;
                         curuid = curuid->next) {
                

-                       if (curuid->packet->tag == 13) {
-                               printf("uid:%.*s\n",
-                                       (int) curuid->packet->length,
-                                       curuid->packet->data);
+                       if (curuid->packet->tag == OPENPGP_PACKET_UID) {
+                               printf("uid:");
+                               for (i = 0; i < (int) curuid->packet->length;
+                                               i++) {
+                                       c = curuid->packet->data[i];
+                                       if (c == '%') {
+                                               putchar('%');
+                                               putchar(c);
+                                       } else if (c == ':' || c > 127) {
+                                               printf("%%%X", c);
+                                       } else {
+                                               putchar(c);
+                                       }
+                               }
+                               printf("\n");

                        }
                }
                keys = keys->next;
                        }
                }
                keys = keys->next;