diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-04-03 05:40:39 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-04-03 16:42:45 +1100 |
| commit | 082804c14e548cada75c81003a3c68ee098138ee (patch) | |
| tree | 47975e7f8c01a4eb2627a6539ab94bab6f53b3c4 | |
| parent | 464ebc82aa926dd132ec75a0b064574ef375675e (diff) | |
upstream: ensure that pkcs11_del_provider() is called before exit -
some PKCS#11 providers get upset if C_Initialize is not matched with
C_Finalize.
From Adithya Baglody via GHPR#234; ok markus
OpenBSD-Commit-ID: f8e770e03b416ee9a58f9762e162add900f832b6
| -rw-r--r-- | ssh.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.552 2021/02/23 00:05:31 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.553 2021/04/03 05:40:39 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1690,6 +1690,10 @@ main(int ac, char **av) options.certificate_files[i] = NULL; } +#ifdef ENABLE_PKCS11 + (void)pkcs11_del_provider(options.pkcs11_provider); +#endif + skip_connect: exit_status = ssh_session2(ssh, cinfo); ssh_conn_info_free(cinfo); |