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.
nodejs · Aug 23, 2012 · 7142b26 · 7142b26
1 parent f8fd9ac
commit 7142b26
Showing 1 changed file with 10 additions and 7 deletions.
diff --git 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 */