Throw away invalid packet data when parsing packets

[onak.git] / keyid.c

diff --git a/keyid.c b/keyid.c
index 6a9b5580c34fa1c6a9df2100f565fd117ce382dc..a68513af81e822cdc74f94d5346a080104b367cb 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -38,6 +38,19 @@
 #include "sha1.h"
 #endif
 
+uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint)
+{
+       uint64_t keyid;
+       int i;
+
+       for (keyid = 0, i = 12; i < 20; i++) {
+               keyid <<= 8;
+               keyid += fingerprint->fp[i];
+       }
+
+       return keyid;
+}
+
 
 /**
  *     get_keyid - Given a public key returns the keyid.
@@ -132,7 +145,7 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
        uint8_t         data;
 #endif
 
-       if (packet == NULL)
+       if (packet == NULL || packet->data == NULL)
                return ONAK_E_INVALID_PARAM;
 
        switch (packet->data[0]) {
@@ -159,11 +172,9 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
                        ripemd160_digest(&ripemd160_context,
                                RIPEMD160_DIGEST_SIZE,
                                fingerprint.fp);
+                       fingerprint.length = RIPEMD160_DIGEST_SIZE;
 
-                       for (*keyid = 0, i = 12; i < 20; i++) {
-                               *keyid <<= 8;
-                               *keyid += fingerprint.fp[i];
-                       }
+                       *keyid = fingerprint2keyid(&fingerprint);
 
                        return ONAK_E_OK;
                }
@@ -194,11 +205,8 @@ onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid)
                break;
        case 4:
                get_fingerprint(packet, &fingerprint);
-               
-               for (*keyid = 0, i = 12; i < 20; i++) {
-                       *keyid <<= 8;
-                       *keyid += fingerprint.fp[i];
-               }
+
+               *keyid = fingerprint2keyid(&fingerprint);
 
                break;
        default: