diff options
author | Daniel Stenberg <daniel@haxx.se> | 2015-06-18 00:06:46 +0200 |
---|---|---|
committer | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-09 11:33:56 -0700 |
commit | 1b20ff0c2fb1dcf77388e4830c475913f48ade75 (patch) | |
tree | d7d740f786ea863f4a5cadf1b08611da820b4919 | |
parent | e6cd738ed3716c02557fb3a47515244e949ade39 (diff) | |
download | android_external_curl-1b20ff0c2fb1dcf77388e4830c475913f48ade75.tar.gz android_external_curl-1b20ff0c2fb1dcf77388e4830c475913f48ade75.tar.bz2 android_external_curl-1b20ff0c2fb1dcf77388e4830c475913f48ade75.zip |
curl: fix build with BoringSSL
OPENSSL_load_builtin_modules does not exist in BoringSSL. Regression
from cae43a1
This change was cherry-picked from upstream at
46d0eba2e9f600972c56bde04357bb5cfe1bc42b.
BUG: 22347561
Change-Id: I22883e923481b79ee61cbce3df312f9478ea16db
-rw-r--r-- | lib/vtls/openssl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index d1ea5fb..02de46f 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -136,6 +136,11 @@ #define CONF_modules_load_file(a,b,c) #endif +#ifdef OPENSSL_IS_BORINGSSL +/* not present in BoringSSL */ +#define OPENSSL_load_builtin_modules(x) +#endif + /* * Number of bytes to read from the random number seed file. This must be * a finite value (because some entropy "files" like /dev/urandom have |