X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyid.c;h=a68513af81e822cdc74f94d5346a080104b367cb;hb=7fd2267eca87bd9bcfe5e66e95e2e683bda1533b;hp=546d65dba175336210818a89d2944982da3e3a71;hpb=23f086c85c5d2db35e9ce76cf0bbf72200b4dc42;p=onak.git

diff --git a/keyid.c b/keyid.c
index 546d65d..a68513a 100644
--- a/keyid.c
+++ b/keyid.c
@@ -43,7 +43,6 @@ uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint)
 	uint64_t keyid;
 	int i;
 
-	keyid = 0;
 	for (keyid = 0, i = 12; i < 20; i++) {
 		keyid <<= 8;
 		keyid += fingerprint->fp[i];
@@ -146,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]) {