Add PKCS11_FORCE_CLEANUP option to control shutdown behavior at exit

NEWS

@@ -4,6 +4,8 @@ New in 0.4.14; unreleased
 * Added support for the "pkcs11prov" provider with OpenSSL 3.0
   (Małgorzata Olszówka)
 * Removed support for OpenSSL older than 1.0.2 (Michał Trojnara)
+* Added PKCS11_FORCE_CLEANUP to force cleanup on exit and avoid memory leaks
+  with certain PKCS#11 modules
 
 New in 0.4.13; 2024-12-13; Michał Trojnara
 * Increased maximum PIN length (Michał Trojnara)

src/eng_back.c

@@ -257,7 +257,7 @@ static int ENGINE_CTX_ctrl_set_vlog(ENGINE_CTX *ctx, void *cb)
 	return 1;
 }
 
-int ENGINE_CTX_ctrl(ENGINE_CTX *ctx, int cmd, long i, void *p, void (*f)())
+int ENGINE_CTX_ctrl(ENGINE_CTX *ctx, int cmd, long i, void *p, void (*f)(void))
 {
 	(void)i; /* We don't currently take integer parameters */
 	(void)f; /* We don't currently take callback parameters */

src/provider.c

@@ -143,10 +143,6 @@ typedef struct {
 	void *ui_method_data;
 } PASSPHRASE_DATA;
 
-#if defined(_WIN32) || defined(_WIN64)
-#define strcasecmp _stricmp
-#endif
-
 /******************************************************************************/
 /* Utility functions                                                          */
 /******************************************************************************/

src/util.h

@@ -46,6 +46,10 @@
 #include "config.h"
 #endif
 
+#if defined(_WIN32) || defined(_WIN64)
+#define strcasecmp _stricmp
+#endif
+
 /* defined in util_uri.c */
 typedef struct util_ctx_st UTIL_CTX; /* opaque */
 

src/util_uri.c

@@ -150,6 +150,10 @@ static int util_ctx_enumerate_slots_unlocked(UTIL_CTX *ctx)
  */
 static void exit_callback(void)
 {
+	const char *str = getenv("PKCS11_FORCE_CLEANUP");
+
+	if (str && (!strcmp(str, "1") || !strcasecmp(str, "yes")))
+		return;
 	g_shutdown_mode = 1;
 }