diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
| commit | bf16d9280ea7aadce5c5437184c1d80e651a997a (patch) | |
| tree | 85c570a9c80181c9bd84ce8bcc726d644daa36db /deps/openssl | |
| parent | 4822d780bb913c9ef7c2301a181a5834887cddb4 (diff) | |
| parent | 24184345688e1f545ffc87e5742de06ed9855007 (diff) | |
| download | android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.bz2 android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.zip | |
Merge branch 'v0.8'
Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/config/android/openssl/opensslconf.h | 17 | ||||
| -rw-r--r-- | deps/openssl/openssl.gyp | 9 |
2 files changed, 18 insertions, 8 deletions
diff --git a/deps/openssl/config/android/openssl/opensslconf.h b/deps/openssl/config/android/openssl/opensslconf.h index 26ac6ba3aa..9280eb2863 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 */ diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index c9dc07dc87..4bd39cd81f 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -652,11 +652,18 @@ 'sources': [ 'openssl/crypto/bn/bn_asm.c', ] - }, { + }], + ['target_arch=="x64"', { 'variables': {'openssl_config_path': 'config/k8'}, 'sources': [ 'openssl/crypto/bn/asm/x86_64-gcc.c', ] + }], + ['target_arch=="arm"', { + 'variables': {'openssl_config_path': 'config/android'}, + 'sources': [ + 'openssl/crypto/bn/bn_asm.c', + ] }] ], 'include_dirs': [ |