diff options
| author | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
| commit | 480da75abf485e7e2a6be5acc0f71842368792c0 (patch) | |
| tree | 4ccbebefd1a3ab6fb0ab91cca34b0459ce145f17 /config/android/openssl/opensslconf.h | |
| parent | 864570723968450a32e842d39f46acfd9a5bb5e5 (diff) | |
| download | openssl-480da75abf485e7e2a6be5acc0f71842368792c0.tar.gz | |
Upgrade chrome's OpenSSL to same version Android ships with.
This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details.
BUG=None
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9254031
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@118977 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'config/android/openssl/opensslconf.h')
| -rw-r--r-- | config/android/openssl/opensslconf.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/config/android/openssl/opensslconf.h b/config/android/openssl/opensslconf.h index 007eaf5..26ac6ba 100644 --- a/config/android/openssl/opensslconf.h +++ b/config/android/openssl/opensslconf.h @@ -4,16 +4,6 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND -#ifndef OPENSSL_NO_CMS -# define OPENSSL_NO_CMS -#endif -#ifndef OPENSSL_NO_CAMELLIA -# define OPENSSL_NO_CAMELLIA -#endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif - #ifndef OPENSSL_NO_CAST # define OPENSSL_NO_CAST |