diff options
| author | Nathan Rajlich <nathan@tootallnate.net> | 2012-08-23 22:28:47 +0400 |
|---|---|---|
| committer | Nathan Rajlich <nathan@tootallnate.net> | 2012-08-24 03:46:03 +0400 |
| commit | 7142b260c6c299fc9697e6554620be47a6f622a9 (patch) | |
| tree | be75db3b379bd52c00f1e2dca1fd07e7c52afb79 /deps | |
| parent | f8fd9aca8bd01fa7226e1abe75a5bcf903f287ab (diff) | |
build: tweak the openssl android configuration to build
Removed NO_CAST, NO_MD2 and NO_STORE because otherwise there were build errors.
Added NO_CAMELLIA, NO_MDC2, and NO_CMS because otherwise there were linker errors.
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/openssl/config/android/openssl/opensslconf.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/deps/openssl/config/android/openssl/opensslconf.h b/deps/openssl/config/android/openssl/opensslconf.h index 26ac6ba3aa7..9280eb28630 100644 --- a/deps/openssl/config/android/openssl/opensslconf.h +++ b/deps/openssl/config/android/openssl/opensslconf.h @@ -5,8 +5,8 @@ #ifndef OPENSSL_DOING_MAKEDEPEND -#ifndef OPENSSL_NO_CAST -# define OPENSSL_NO_CAST +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP @@ -20,8 +20,11 @@ #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif -#ifndef OPENSSL_NO_MD2 -# define OPENSSL_NO_MD2 +#ifndef OPENSSL_NO_MDC2 +# define OPENSSL_NO_MDC2 +#endif +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 @@ -35,9 +38,6 @@ #ifndef OPENSSL_NO_SHA0 # define OPENSSL_NO_SHA0 #endif -#ifndef OPENSSL_NO_STORE -# define OPENSSL_NO_STORE -#endif #ifndef OPENSSL_NO_WHRLPOOL # define OPENSSL_NO_WHRLPOOL #endif @@ -92,6 +92,9 @@ # if defined(OPENSSL_NO_WHRLPOOL) && !defined(NO_WHRLPOOL) # define NO_WHRLPOOL # endif +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) +# define NO_MDC2 +# endif #endif /* crypto/opensslconf.h.in */ |