1c1
< /* $OpenBSD: ssh-pkcs11.c,v 1.21 2015/07/18 08:02:17 djm Exp $ */
---
> /* $OpenBSD: ssh-pkcs11.c,v 1.22 2016/02/12 00:20:30 djm Exp $ */
325,326c325,328
< k11->keyid = xmalloc(k11->keyid_len);
< memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
---
> if (k11->keyid_len > 0) {
> k11->keyid = xmalloc(k11->keyid_len);
> memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len);
> }