From 70d055c16cb7ca09170ad0df54b4bc46b86a96ed Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Mon, 29 Dec 2014 16:10:48 -0800 Subject: [PATCH] Fix SSL CA cert issue on CentOS Fix "Problem with the SSL CA cert" issue @ https://github.com/google/edash-packager/issues/6. On Ubuntu, CURL_CA_BUNDLE is located at "/etc/ssl/certs/ca-certificates.crt" while on CentOs, it is located at "/etc/ssl/certs/ca-bundle.crt". With this change, GYP scans the common appearing locations for SSL CA cert. Change-Id: I838bae3954ec51f1430c900d1e82596d45a4db84 --- .../curl/config/linux/curl_config.h | 2 +- packager/third_party/curl/curl.gyp | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/packager/third_party/curl/config/linux/curl_config.h b/packager/third_party/curl/config/linux/curl_config.h index c219b45f3b..82722d52be 100644 --- a/packager/third_party/curl/config/linux/curl_config.h +++ b/packager/third_party/curl/config/linux/curl_config.h @@ -2,7 +2,7 @@ /* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ /* Location of default ca bundle */ -#define CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" +/* CURL_CA_BUNDLE is defined by GYP */ /* Location of default ca path */ /* #undef CURL_CA_PATH */ diff --git a/packager/third_party/curl/curl.gyp b/packager/third_party/curl/curl.gyp index 254996f2cf..240389e9ed 100644 --- a/packager/third_party/curl/curl.gyp +++ b/packager/third_party/curl/curl.gyp @@ -5,6 +5,23 @@ # https://developers.google.com/open-source/licenses/bsd { + 'variables': { + # Scan ca bundle in its common appearing locations. + 'curl_ca_bundle%': + '