diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-10-31 13:36:30 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-10-31 13:39:49 +0100 |
| commit | 06f61de6c141f7810a7988c3918d380e0cff2f46 (patch) | |
| tree | 82851982d53de6bf95b1a8dea7791e012c7629f7 | |
| parent | 196677150f711a96c38ed123e621f1d4e995b2e5 (diff) | |
| download | curl-bagder/schannel-curl-prefix.tar.gz | |
schannel: use Curl_ prefix for global private symbolsbagder/schannel-curl-prefix
Curl_verify_certificate() must use the Curl_ prefix since it is globally
available in the lib and otherwise steps outside of our namespace!
| -rw-r--r-- | lib/vtls/schannel.c | 2 | ||||
| -rw-r--r-- | lib/vtls/schannel.h | 4 | ||||
| -rw-r--r-- | lib/vtls/schannel_verify.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index e4426924b..1a9da44d8 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -1114,7 +1114,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) #ifdef HAS_MANUAL_VERIFY_API if(conn->ssl_config.verifypeer && BACKEND->use_manual_cred_validation) { - return verify_certificate(conn, sockindex); + return Curl_verify_certificate(conn, sockindex); } #endif diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h index e491bd431..ee8d7d47a 100644 --- a/lib/vtls/schannel.h +++ b/lib/vtls/schannel.h @@ -8,7 +8,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al. - * Copyright (C) 2012 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -53,7 +53,7 @@ extern const struct Curl_ssl Curl_ssl_schannel; -CURLcode verify_certificate(struct connectdata *conn, int sockindex); +CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex); /* structs to expose only in schannel.c and schannel_verify.c */ #ifdef EXPOSE_SCHANNEL_INTERNAL_STRUCTS diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index 2516f5665..1b34bf725 100644 --- a/lib/vtls/schannel_verify.c +++ b/lib/vtls/schannel_verify.c @@ -406,7 +406,7 @@ cleanup: return result; } -CURLcode verify_certificate(struct connectdata *conn, int sockindex) +CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex) { SECURITY_STATUS status; struct Curl_easy *data = conn->data; |