wintls: move UnloadSecurityLibrary into ssl_cleanup

lifenjoiner · Dec 26, 2023 · 965ae05 · 965ae05
1 parent 07acb56
commit 965ae05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/init.c b/src/init.c
@@ -1971,7 +1971,7 @@ cleanup (void)
   host_cleanup ();
   log_cleanup ();
   netrc_cleanup ();
-#if defined HAVE_SSL && !defined HAVE_WINTLS
+#if defined HAVE_SSL
   ssl_cleanup ();
 #endif
   connect_cleanup ();

diff --git a/src/win-sspi.c b/src/win-sspi.c
@@ -89,12 +89,11 @@ bool LoadSecurityLibrary(void) {
         goto FAIL;
     }
 
-    atexit(UnloadSecurityLibrary);
     return true;
 
 FAIL:
-	UnloadSecurityLibrary();
-	return false;
+    UnloadSecurityLibrary();
+    return false;
 }
 
 void UnloadSecurityLibrary(void) {

diff --git a/src/wintls.c b/src/wintls.c
@@ -1320,6 +1320,10 @@ bool ssl_init(void) {
     return true;
 }
 
+void ssl_cleanup (void) {
+    UnloadSecurityLibrary();
+}
+
 /* Perform the SSL/TLS handshake and wrap the connection handle reader and writer
     connection-oriented sockets (type SOCK_STREAM)
 */