From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 23 Jan 2020 19:05:22 +0000 (+0100)
Subject: wolfssh: make it init properly via Curl_ssh_init()
X-Git-Tag: curl-7_69_0~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=920af1a6643af4f5f6ea58bead2bcc19c527f517;p=thirdparty%2Fcurl.git

wolfssh: make it init properly via Curl_ssh_init()

Closes #4846
---

diff --git a/lib/easy.c b/lib/easy.c
index 9211bc2191..d1b60861f5 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -193,13 +193,6 @@ static CURLcode global_init(long flags, bool memoryfuncs)
   }
 #endif
 
-#ifdef USE_WOLFSSH
-  if(WS_SUCCESS != wolfSSH_Init()) {
-    DEBUGF(fprintf(stderr, "Error: wolfSSH_Init failed\n"));
-    return CURLE_FAILED_INIT;
-  }
-#endif
-
   if(flags & CURL_GLOBAL_ACK_EINTR)
     Curl_ack_eintr = 1;
 
diff --git a/lib/vssh/wolfssh.c b/lib/vssh/wolfssh.c
index f9c43de703..363a52c772 100644
--- a/lib/vssh/wolfssh.c
+++ b/lib/vssh/wolfssh.c
@@ -1142,6 +1142,11 @@ size_t Curl_ssh_version(char *buffer, size_t buflen)
 
 CURLcode Curl_ssh_init(void)
 {
+  if(WS_SUCCESS != wolfSSH_Init()) {
+    DEBUGF(fprintf(stderr, "Error: wolfSSH_Init failed\n"));
+    return CURLE_FAILED_INIT;
+  }
+
   return CURLE_OK;
 }
 void Curl_ssh_cleanup(void)