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

diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 4533204..6085f3d 100644 (file)
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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
@@ -1669,6 +1669,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);