| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From f2c37fab5dbaffa06c1268ee1309596306c9a4df Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 20 Nov 2018 12:23:47 -0800 |
| 4 | Subject: [PATCH] Adjust for CURLE_SSL_CACERT deprecation in curl >= 7.62 |
| 5 | |
| 6 | Use CURLE_PEER_FAILED_VERIFICATION instead |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | src/lib/wsman-curl-client-transport.c | 7 +++++++ |
| 13 | 1 file changed, 7 insertions(+) |
| 14 | |
| 15 | diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c |
| 16 | index d0a3829b..92727f4f 100644 |
| 17 | --- a/src/lib/wsman-curl-client-transport.c |
| 18 | +++ b/src/lib/wsman-curl-client-transport.c |
| 19 | @@ -186,16 +186,23 @@ convert_to_last_error(CURLcode r) |
| 20 | return WS_LASTERR_SSL_CONNECT_ERROR; |
| 21 | case CURLE_BAD_FUNCTION_ARGUMENT: |
| 22 | return WS_LASTERR_CURL_BAD_FUNCTION_ARG; |
| 23 | +#if LIBCURL_VERSION_NUM < 0x073E00 |
| 24 | case CURLE_SSL_PEER_CERTIFICATE: |
| 25 | return WS_LASTERR_SSL_PEER_CERTIFICATE; |
| 26 | +#endif |
| 27 | case CURLE_SSL_ENGINE_NOTFOUND: |
| 28 | return WS_LASTERR_SSL_ENGINE_NOTFOUND; |
| 29 | case CURLE_SSL_ENGINE_SETFAILED: |
| 30 | return WS_LASTERR_SSL_ENGINE_SETFAILED; |
| 31 | case CURLE_SSL_CERTPROBLEM: |
| 32 | return WS_LASTERR_SSL_CERTPROBLEM; |
| 33 | +#if LIBCURL_VERSION_NUM < 0x073E00 |
| 34 | case CURLE_SSL_CACERT: |
| 35 | return WS_LASTERR_SSL_CACERT; |
| 36 | +#else |
| 37 | + case CURLE_PEER_FAILED_VERIFICATION: |
| 38 | + return WS_LASTERR_SSL_PEER_CERTIFICATE; |
| 39 | +#endif |
| 40 | #if LIBCURL_VERSION_NUM > 0x70C01 |
| 41 | case CURLE_SSL_ENGINE_INITFAILED: |
| 42 | return WS_LASTERR_SSL_ENGINE_INITFAILED; |