diff options
| author | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-11 00:15:29 +0000 |
| commit | bb6f58c772c321121b8148fe7726de90f90e1dec (patch) | |
| tree | 755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/ssh-pkcs11.c | |
| parent | 0e0b4ac1f05aada737d7d2280ab40c6b06016981 (diff) | |
| parent | 9169dee5c46ff1d9dfce5c97590347e20a54c84e (diff) | |
| download | FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.zip FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.tar.gz | |
Upgrade to OpenSSH 7.2p2.
Diffstat (limited to 'crypto/openssh/ssh-pkcs11.c')
| -rw-r--r-- | crypto/openssh/ssh-pkcs11.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-pkcs11.c b/crypto/openssh/ssh-pkcs11.c index 92614a5..d1f750d 100644 --- a/crypto/openssh/ssh-pkcs11.c +++ b/crypto/openssh/ssh-pkcs11.c @@ -1,4 +1,4 @@ -/* $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 $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -322,8 +322,10 @@ pkcs11_rsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, k11->slotidx = slotidx; /* identify key object on smartcard */ k11->keyid_len = keyid_attrib->ulValueLen; - 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); + } k11->orig_finish = def->finish; memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method)); k11->rsa_method.name = "pkcs11"; |
