autoconf onak-mail.pl config

[onak.git] / decodekey.c

diff --git a/decodekey.c b/decodekey.c
index 5818488b766a92a9ad98dc595277097ecc0695f0..efffad7d7863a7e310647113801fb21ba545c22f 100644 (file)
--- a/decodekey.c
+++ b/decodekey.c
@@ -4,11 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: decodekey.c,v 1.6 2004/05/27 03:24:01 noodles Exp $
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +34,7 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid)
        int length = 0;
        int packetlen = 0;
 
-       assert(data != NULL);
+       log_assert(data != NULL);
 
        length = (data[0] << 8) + data[1] + 2;
 
@@ -271,7 +268,7 @@ uint64_t *keysubkeys(struct openpgp_publickey *key)
                        subkeys[count++] = get_packetid(cursubkey->packet);
                        cursubkey = cursubkey -> next;
                }
-               subkeys[count] = NULL;
+               subkeys[count] = 0;
        }
 
        return subkeys;