diff options
| author | des <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
| commit | 7573e91b127f1c198210fd345d3ca198b598cfc6 (patch) | |
| tree | d32fb61cec38c52314210c3459fd436685dacdba /crypto/openssh/ssh-pkcs11-helper.c | |
| parent | c692973c992c321bb10e631f572fab1500ae5b0e (diff) | |
| parent | 45d0197dd79eceffb5bbc29f75199eb09af5a5f9 (diff) | |
| download | FreeBSD-src-7573e91b127f1c198210fd345d3ca198b598cfc6.zip FreeBSD-src-7573e91b127f1c198210fd345d3ca198b598cfc6.tar.gz | |
Upgrade to OpenSSH 6.5p1.
Diffstat (limited to 'crypto/openssh/ssh-pkcs11-helper.c')
| -rw-r--r-- | crypto/openssh/ssh-pkcs11-helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/ssh-pkcs11-helper.c b/crypto/openssh/ssh-pkcs11-helper.c index 39b2e7c..b7c52be 100644 --- a/crypto/openssh/ssh-pkcs11-helper.c +++ b/crypto/openssh/ssh-pkcs11-helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.6 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.7 2013/12/02 02:56:17 djm Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -127,7 +127,8 @@ process_add(void) buffer_put_char(&msg, SSH2_AGENT_IDENTITIES_ANSWER); buffer_put_int(&msg, nkeys); for (i = 0; i < nkeys; i++) { - key_to_blob(keys[i], &blob, &blen); + if (key_to_blob(keys[i], &blob, &blen) == 0) + continue; buffer_put_string(&msg, blob, blen); buffer_put_cstring(&msg, name); free(blob); |
