Clean up "set but not used" GCC warnings

[onak.git] / keyid.c

diff --git a/keyid.c b/keyid.c
index 2bec710026f85a92fe4ce6f8547700d6b998f3c1..a7051f2d23552dc1bc8b5f9c464ced26c11f3f05 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -1,17 +1,33 @@
 /*
  * keyid.c - Routines to calculate key IDs.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 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 <string.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
 
 #include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
+#include "parsekey.h"
 #include "md5.h"
+#include "mem.h"
+#include "merge.h"
 #include "sha1.h"
 
 
@@ -156,3 +172,88 @@ uint64_t get_packetid(struct openpgp_packet *packet)
 
        return keyid;
 }
+
+static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list
+                                                       *packets)
+{
+       struct openpgp_packet_list *sorted, **cur, *next;
+
+       sorted = NULL;
+       while (packets != NULL) {
+               cur = &sorted;
+               while (*cur != NULL && compare_packets((*cur)->packet,
+                               packets->packet) < 0) {
+                       cur = &((*cur)->next);
+               }
+               next = *cur;
+               *cur = packets;
+               packets = packets->next;
+               (*cur)->next = next;
+       }
+
+       return sorted;
+}
+
+void get_skshash(struct openpgp_publickey *key, struct skshash *hash)
+{
+       struct openpgp_packet_list *packets = NULL, *list_end = NULL;
+       struct openpgp_packet_list *curpacket;
+       struct md5_ctx md5_context;
+       struct openpgp_publickey *next;
+       uint32_t tmp;
+
+       /*
+        * We only want a single key, so clear any link to the next
+        * one for the period during the flatten.
+        */
+       next = key->next;
+       key->next = NULL;
+       flatten_publickey(key, &packets, &list_end);
+       key->next = next;
+       packets = sortpackets(packets);
+
+       md5_init_ctx(&md5_context);
+
+       for (curpacket = packets; curpacket != NULL;
+                       curpacket = curpacket->next) {
+               tmp = htonl(curpacket->packet->tag);
+               md5_process_bytes(&tmp, sizeof(tmp), &md5_context);
+               tmp = htonl(curpacket->packet->length);
+               md5_process_bytes(&tmp, sizeof(tmp), &md5_context);
+               md5_process_bytes(curpacket->packet->data,
+                               curpacket->packet->length,
+                               &md5_context);
+       }
+
+       md5_finish_ctx(&md5_context, &hash->hash);
+       free_packet_list(packets);
+}
+
+uint8_t hexdigit(char c)
+{
+       if (c >= '0' && c <= '9')
+               return c - '0';
+       else if (c >= 'a' && c <= 'f')
+               return c - 'a' + 10;
+       else if (c >= 'A' && c <= 'F')
+               return c - 'A' + 10;
+       else
+               return 0;
+}
+
+int parse_skshash(char *search, struct skshash *hash)
+{
+       int i, len;
+
+       len = strlen(search);
+       if (len > 32) {
+               return 0;
+       }
+
+       for (i = 0; i < len; i += 2) {
+               hash->hash[i >> 1] = (hexdigit(search[i]) << 4) +
+                               hexdigit(search[i + 1]);
+       }
+
+       return 1;
+}