diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-14 15:12:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 12:56:17 +0200 |
| commit | 743f616ccac70cf4f76c0f313f73f2916459310d (patch) | |
| tree | 26830f6492dc47eb9b26632f43a106e434cd655c | |
| parent | 5857e2f99de7d67dbc55979222fc3bded93c584d (diff) | |
| download | qtwebengine-chromium-743f616ccac70cf4f76c0f313f73f2916459310d.tar.gz | |
Only define OPENSSLDIR if it is not already defined
For embedded we define our OPENSSLDIR which might be different from
the default.
Change-Id: Ied87502b76a79b47c5add3a763a9b88fed57318a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/third_party/boringssl/src/crypto/x509/x509_def.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/third_party/boringssl/src/crypto/x509/x509_def.c b/chromium/third_party/boringssl/src/crypto/x509/x509_def.c index cb34ea4a946..20fff123192 100644 --- a/chromium/third_party/boringssl/src/crypto/x509/x509_def.c +++ b/chromium/third_party/boringssl/src/crypto/x509/x509_def.c @@ -59,11 +59,13 @@ /* TODO(fork): cleanup */ +#ifndef OPENSSLDIR #if defined(OPENSSL_FUCHSIA) #define OPENSSLDIR "/system/data/boringssl" #else #define OPENSSLDIR "/etc/ssl" #endif +#endif #define X509_CERT_AREA OPENSSLDIR #define X509_CERT_DIR OPENSSLDIR "/certs" |