diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-25 09:08:54 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 9500c8234d8e99396717b9e43f10cc518e8bf668 (patch) | |
| tree | 51975e210b7900643c21d2ad67b3a65a902fc591 /crypto/http/http_lib.c | |
| parent | e4bec869104cf4ba51cbb1effb0f5437e327ecd8 (diff) | |
Fix misc external ossl_ symbols.
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/http/http_lib.c')
| -rw-r--r-- | crypto/http/http_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c index 8b300a9db0..ebb2af9b2e 100644 --- a/crypto/http/http_lib.c +++ b/crypto/http/http_lib.c @@ -239,7 +239,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost, return 0; } -int http_use_proxy(const char *no_proxy, const char *server) +int ossl_http_use_proxy(const char *no_proxy, const char *server) { size_t sl; const char *found = NULL; @@ -265,8 +265,8 @@ int http_use_proxy(const char *no_proxy, const char *server) return found == NULL; } -const char *http_adapt_proxy(const char *proxy, const char *no_proxy, - const char *server, int use_ssl) +const char *ossl_http_adapt_proxy(const char *proxy, const char *no_proxy, + const char *server, int use_ssl) { const int http_len = strlen(OSSL_HTTP_PREFIX); const int https_len = strlen(OSSL_HTTPS_PREFIX); @@ -289,7 +289,7 @@ const char *http_adapt_proxy(const char *proxy, const char *no_proxy, else if (strncmp(proxy, OSSL_HTTPS_PREFIX, https_len) == 0) proxy += https_len; - if (*proxy == '\0' || !http_use_proxy(no_proxy, server)) + if (*proxy == '\0' || !ossl_http_use_proxy(no_proxy, server)) return NULL; return proxy; } |