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

diff --git a/ssh.c b/ssh.c
index 53330da5aecd18a7a23dbd289889fc07b6398c0c..a8c0a4b0fd5274675daf69a88acd989b531d566e 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -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);