diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2019-03-08 18:24:43 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-03-26 00:20:22 +0100 |
| commit | 2aee9a49f668092ac5c9d34e904ef7a9722e541d (patch) | |
| tree | 2e5bf22e6e05f99165f92a1f0276901db228016d /ssh-pkcs11.c | |
| parent | Fix build when configured --without-openssl. (diff) | |
| download | openssh-2aee9a49f668092ac5c9d34e904ef7a9722e541d.tar.xz openssh-2aee9a49f668092ac5c9d34e904ef7a9722e541d.zip | |
upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL
OpenBSD-Commit-ID: febce81cca72b71f70513fbee4ff52ca050f675c
Diffstat (limited to 'ssh-pkcs11.c')
| -rw-r--r-- | ssh-pkcs11.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index a1a2bab45..70f06bffe 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.c,v 1.42 2019/02/04 23:37:54 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11.c,v 1.43 2019/03/08 17:24:43 markus Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * Copyright (c) 2014 Pedro Martelletto. All rights reserved. @@ -1124,6 +1124,7 @@ pkcs11_fetch_certs(struct pkcs11_provider *p, CK_ULONG slotidx, break; default: /* XXX print key type? */ + key = NULL; error("skipping unsupported certificate type"); } @@ -1225,6 +1226,7 @@ pkcs11_fetch_keys(struct pkcs11_provider *p, CK_ULONG slotidx, #endif /* HAVE_EC_KEY_METHOD_NEW */ default: /* XXX print key type? */ + key = NULL; error("skipping unsupported key type"); } |