From: Tobias Brunner Date: Wed, 20 Mar 2013 15:59:45 +0000 (+0100) Subject: android: No need to disable CMS explicitly X-Git-Tag: 5.0.3rc1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b5e7152219e9eeb8d5856eee47b297e6c08793;p=thirdparty%2Fstrongswan.git android: No need to disable CMS explicitly The version check introduced with 0d237763 should take care of it. --- diff --git a/Android.mk b/Android.mk index b17a3f633f..e762fe9558 100644 --- a/Android.mk +++ b/Android.mk @@ -67,7 +67,6 @@ strongswan_CFLAGS := \ -DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \ -DHAVE_IPSEC_MODE_BEET \ -DHAVE_IPSEC_DIR_FWD \ - -DOPENSSL_NO_CMS \ -DOPENSSL_NO_EC \ -DOPENSSL_NO_ECDSA \ -DOPENSSL_NO_ECDH \ diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk index 164cae5828..9805bff7e5 100644 --- a/src/frontends/android/jni/Android.mk +++ b/src/frontends/android/jni/Android.mk @@ -37,7 +37,6 @@ strongswan_CFLAGS := \ -DHAVE_IPSEC_DIR_FWD \ -DHAVE_IN6ADDR_ANY \ -DHAVE_NETINET_IP6_H \ - -DOPENSSL_NO_CMS \ -DOPENSSL_NO_ENGINE \ -DCONFIG_H_INCLUDED \ -DCAPABILITIES \