[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 53/282: wolfssh: make it init properly via Curl_ssh_init()
From: |
gnunet |
Subject: |
[gnurl] 53/282: wolfssh: make it init properly via Curl_ssh_init() |
Date: |
Wed, 01 Apr 2020 14:28:38 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 920af1a6643af4f5f6ea58bead2bcc19c527f517
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jan 23 20:05:22 2020 +0100
wolfssh: make it init properly via Curl_ssh_init()
Closes #4846
---
lib/easy.c | 7 -------
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)
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 62/282: RELEASE-NOTES: synced, (continued)
- [gnurl] 62/282: RELEASE-NOTES: synced, gnunet, 2020/04/01
- [gnurl] 48/282: RELEASE-NOTES: synced, gnunet, 2020/04/01
- [gnurl] 58/282: conn: do not reuse connection if SOCKS proxy credentials differ, gnunet, 2020/04/01
- [gnurl] 37/282: wolfssl: use the wc-prefixed symbol alternatives, gnunet, 2020/04/01
- [gnurl] 28/282: CMake: Add support for CMAKE_LTO option., gnunet, 2020/04/01
- [gnurl] 38/282: RELEASE-NOTES: synced, gnunet, 2020/04/01
- [gnurl] 44/282: curl: Let -D merge headers in one file again, gnunet, 2020/04/01
- [gnurl] 41/282: http.h: Copyright year out of date, should be 2020, gnunet, 2020/04/01
- [gnurl] 52/282: form.d: fix two minor typos, gnunet, 2020/04/01
- [gnurl] 64/282: README: mention that the docs is in docs/, gnunet, 2020/04/01
- [gnurl] 53/282: wolfssh: make it init properly via Curl_ssh_init(),
gnunet <=
- [gnurl] 56/282: conncache: removed unused Curl_conncache_bundle_size(), gnunet, 2020/04/01
- [gnurl] 54/282: singleuse.pl: support new API functions, fix curl_dbg_ handling, gnunet, 2020/04/01
- [gnurl] 55/282: strcase: turn Curl_raw_tolower into static, gnunet, 2020/04/01
- [gnurl] 63/282: curl.h: define CURL_WIN32 on windows, gnunet, 2020/04/01
- [gnurl] 57/282: llist: removed unused Curl_llist_move(), gnunet, 2020/04/01
- [gnurl] 59/282: global_init: assume the EINTR bit by default, gnunet, 2020/04/01
- [gnurl] 36/282: polarssl: removed, gnunet, 2020/04/01
- [gnurl] 43/282: data.d: remove "Multiple files can also be specified", gnunet, 2020/04/01
- [gnurl] 49/282: mk-ca-bundle: add support for CKA_NSS_SERVER_DISTRUST_AFTER, gnunet, 2020/04/01
- [gnurl] 72/282: ngtcp2: update to git master and its draft-25 support, gnunet, 2020/04/01