X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=inline;f=keyid.c;h=d5244943f8e0c4480294900ad02c8577dc0b1fa2;hb=357fbc65bfab230bbf12313e8b458d8325a6174f;hp=546d65dba175336210818a89d2944982da3e3a71;hpb=23f086c85c5d2db35e9ce76cf0bbf72200b4dc42;p=onak.git
diff --git a/keyid.c b/keyid.c
index 546d65d..d524494 100644
--- a/keyid.c
+++ b/keyid.c
@@ -13,8 +13,7 @@
* 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.
+ * this program. If not, see .
*/
#include
@@ -43,7 +42,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 +144,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]) {