Fix the size of the hash array when checking sig hashes

[onak.git] / keyid.c

diff --git a/keyid.c b/keyid.c
index 29c61f00137134f0685d5bdc382a25a3ac12b2a8..c75f0a178854b3146bb8aa252cc1b4f27c43af07 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -1,23 +1,41 @@
 /*
  * 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 "config.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
 #include "parsekey.h"
-#include "md5.h"
 #include "mem.h"
 #include "merge.h"
+
+#ifdef HAVE_NETTLE
+#include <nettle/md5.h>
+#include <nettle/sha.h>
+#else
+#include "md5.h"
 #include "sha1.h"
+#endif
 
 
 /**
@@ -43,7 +61,7 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet,
        unsigned char *fingerprint,
        size_t *len)
 {
-       SHA1_CTX sha_ctx;
+       struct sha1_ctx sha_ctx;
        struct md5_ctx md5_context;
        unsigned char c;
        size_t         modlen, explen;
@@ -56,41 +74,40 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet,
        switch (packet->data[0]) {
        case 2:
        case 3:
-               md5_init_ctx(&md5_context);
+               md5_init(&md5_context);
 
                /*
                 * MD5 the modulus and exponent.
                 */
                modlen = ((packet->data[8] << 8) +
                         packet->data[9] + 7) >> 3;
-               md5_process_bytes(&packet->data[10], modlen, &md5_context);
+               md5_update(&md5_context, modlen, &packet->data[10]);
 
                explen = ((packet->data[10+modlen] << 8) +
                         packet->data[11+modlen] + 7) >> 3;
-               md5_process_bytes(&packet->data[12 + modlen], explen,
-                               &md5_context);
+               md5_update(&md5_context, explen, &packet->data[12 + modlen]);
 
-               md5_finish_ctx(&md5_context, fingerprint);
                *len = 16;
+               md5_digest(&md5_context, *len, fingerprint);
 
                break;
 
        case 4:
-               SHA1Init(&sha_ctx);
+               sha1_init(&sha_ctx);
                /*
                 * TODO: Can this be 0x99? Are all public key packets old
                 * format with 2 bytes of length data?
                 */
                c = 0x99;
-               SHA1Update(&sha_ctx, &c, sizeof(c));
+               sha1_update(&sha_ctx, sizeof(c), &c);
                c = packet->length >> 8;
-               SHA1Update(&sha_ctx, &c, sizeof(c));
+               sha1_update(&sha_ctx, sizeof(c), &c);
                c = packet->length & 0xFF;
-               SHA1Update(&sha_ctx, &c, sizeof(c));
-               SHA1Update(&sha_ctx, packet->data,
-                       packet->length);
-               SHA1Final(fingerprint, &sha_ctx);
+               sha1_update(&sha_ctx, sizeof(c), &c);
+               sha1_update(&sha_ctx, packet->length,
+                       packet->data);
                *len = 20;
+               sha1_digest(&sha_ctx, *len, fingerprint);
 
                break;
        default:
@@ -201,20 +218,20 @@ void get_skshash(struct openpgp_publickey *key, struct skshash *hash)
        key->next = next;
        packets = sortpackets(packets);
 
-       md5_init_ctx(&md5_context);
+       md5_init(&md5_context);
 
        for (curpacket = packets; curpacket != NULL;
                        curpacket = curpacket->next) {
                tmp = htonl(curpacket->packet->tag);
-               md5_process_bytes(&tmp, sizeof(tmp), &md5_context);
+               md5_update(&md5_context, sizeof(tmp), (void *) &tmp);
                tmp = htonl(curpacket->packet->length);
-               md5_process_bytes(&tmp, sizeof(tmp), &md5_context);
-               md5_process_bytes(curpacket->packet->data,
+               md5_update(&md5_context, sizeof(tmp), (void *) &tmp);
+               md5_update(&md5_context,
                                curpacket->packet->length,
-                               &md5_context);
+                               curpacket->packet->data);
        }
 
-       md5_finish_ctx(&md5_context, &hash->hash);
+       md5_digest(&md5_context, 16, (uint8_t *) &hash->hash);
        free_packet_list(packets);
 }