diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-01-23 20:05:22 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-01-24 10:27:31 +0100 |
| commit | 920af1a6643af4f5f6ea58bead2bcc19c527f517 (patch) | |
| tree | 734acf7a5f65de576c47e41f4afebf9787371a0a | |
| parent | 1c532870ed531ee173d8d0f0e067d3105f57f83f (diff) | |
| download | curl-920af1a6643af4f5f6ea58bead2bcc19c527f517.tar.gz | |
wolfssh: make it init properly via Curl_ssh_init()
Closes #4846
| -rw-r--r-- | lib/easy.c | 7 | ||||
| -rw-r--r-- | lib/vssh/wolfssh.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/easy.c b/lib/easy.c index 9211bc219..d1b60861f 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 f9c43de70..363a52c77 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) |