- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13830 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: mikej Date: Thu Jun 18 01:08:02 2009 New Revision: 13830 Log: build as c code again.. now that this is fixed in core for windows. Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj Thu Jun 18 01:08:02 2009 @@ -281,7 +281,7 @@ > <Tool Name="VCCLCompilerTool" - CompileAs="2" + CompileAs="1" /> </FileConfiguration> <FileConfiguration @@ -289,7 +289,7 @@ > <Tool Name="VCCLCompilerTool" - CompileAs="2" + CompileAs="1" /> </FileConfiguration> <FileConfiguration @@ -297,7 +297,7 @@ > <Tool Name="VCCLCompilerTool" - CompileAs="2" + CompileAs="1" /> </FileConfiguration> <FileConfiguration @@ -305,7 +305,7 @@ > <Tool Name="VCCLCompilerTool" - CompileAs="2" + CompileAs="1" /> </FileConfiguration> </File>

1 0

[commit] r13829 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: mrene Date: Thu Jun 18 01:01:45 2009 New Revision: 13829 Log: Fix up SWITCH_CONFIG_ITEM_STRING_STRDUP to please windows Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Thu Jun 18 01:01:45 2009 @@ -99,7 +99,7 @@ }; #define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext) { _key, _type, _flags, _ptr, (void*)_defaultvalue, (void*)_data, NULL, _syntax, _helptext } -#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext) { (_key), SWITCH_CONFIG_STRING, (_flags), (_ptr), ((void*)_defaultvalue), (&switch_config_string_strdup), (NULL), (_syntax), (_helptext) } +#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext) { (_key), SWITCH_CONFIG_STRING, (_flags), (_ptr), ((void*)_defaultvalue), (NULL), (NULL), (_syntax), (_helptext) } #define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _function, _functiondata, _syntax, _helptext) { _key, _type, _flags, _ptr, (void*)_defaultvalue, _functiondata, _function, _syntax, _helptext } #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL, NULL, NULL, NULL, NULL, NULL } Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Jun 18 01:01:45 2009 @@ -201,15 +201,10 @@ break; case SWITCH_CONFIG_STRING: { - switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; + switch_xml_config_string_options_t string_options_default = { 0 }; + switch_xml_config_string_options_t *string_options = item->data ? (switch_xml_config_string_options_t*)item->data : &string_options_default; const char *newstring = NULL; - if (!string_options) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n", - item->key); - return SWITCH_STATUS_FALSE; - } - /* Perform validation */ if (value) { if (!switch_strlen_zero(string_options->validation_regex)) {

1 0

[commit] r13828 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: andrew Date: Wed Jun 17 23:20:45 2009 New Revision: 13828 Log: Initial decryption support Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Jun 17 23:20:45 2009 @@ -373,6 +373,36 @@ if (host_hash == globals.host_hash) { continue; } +#ifdef HAVE_OPENSSL + if (globals.psk) { + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; + char *tmp; + int outl, tmplen; + EVP_CIPHER_CTX ctx; + + len -= sizeof(host_hash) + SWITCH_UUID_FORMATTED_LENGTH; + + tmp = malloc(len); + + memset(tmp, 0, len); + + switch_copy_string(uuid_str, packet, SWITCH_UUID_FORMATTED_LENGTH); + packet += SWITCH_UUID_FORMATTED_LENGTH; + + EVP_CIPHER_CTX_init(&ctx); + EVP_DecryptInit(&ctx, EVP_bf_cfb(), NULL, NULL); + EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk)); + EVP_DecryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str); + EVP_DecryptUpdate(&ctx, (unsigned char*) tmp, + &outl, (unsigned char*) packet, (int) len); + EVP_DecryptFinal(&ctx, (unsigned char*) tmp + outl, &tmplen); + + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decrypted event as %s\n----------\n of actual length %d (%d) %d\n", tmp, outl + tmplen, (int) len, (int) strlen(tmp));*/ + /*continue;*/ + packet = tmp; + + } +#endif //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { char *var, *val, *term = NULL, tmpname[128];

1 0

[commit] r13827 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: andrew Date: Wed Jun 17 23:19:42 2009 New Revision: 13827 Log: Fix offset Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Jun 17 23:19:42 2009 @@ -223,7 +223,7 @@ EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str); EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH, &outlen, (unsigned char*) packet, (int) strlen(packet)); - EVP_EncryptFinal(&ctx, (unsigned char*) buf + outlen, &tmplen); + EVP_EncryptFinal(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen); outlen += tmplen; len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH; } else {

1 0

[commit] r13826 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 18 Jun '09

18 Jun '09

Author: andrew Date: Wed Jun 17 21:19:13 2009 New Revision: 13826 Log: Use OpenSSL to optionally use a pre-shared key to encrypt multicast packets (no decryption yet) Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Jun 17 21:19:13 2009 @@ -29,6 +29,9 @@ * mod_event_multicast.c -- Multicast Events * */ +#ifdef HAVE_OPENSSL +#include <openssl/evp.h> +#endif #include <switch.h> #define MULTICAST_BUFFSIZE 65536 @@ -56,10 +59,14 @@ int running; switch_event_node_t *node; uint8_t ttl; + char *psk; } globals; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); +#ifdef HAVE_OPENSSL +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_psk, globals.psk); +#endif #define MULTICAST_EVENT "multicast::event" static switch_status_t load_config(void) { @@ -76,6 +83,7 @@ globals.key_count = 0; globals.ttl = 1; + globals.psk = NULL; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); @@ -98,6 +106,12 @@ set_global_bindings(val); } else if (!strcasecmp(var, "port")) { globals.port = (switch_port_t) atoi(val); + } else if (!strcasecmp(var, "psk")) { +#ifdef HAVE_OPENSSL + set_global_psk(val); +#else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot use pre shared key encryption without OpenSSL support\n"); +#endif } else if (!strcasecmp(var, "ttl")) { int ttl = atoi(val); if ((ttl && ttl <= 255) || !strcmp(val, "0")) { @@ -181,11 +195,44 @@ default: switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", globals.hostname); if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - size_t len = strlen(packet) + sizeof(globals.host_hash); - char *buf = malloc(len + 1); + size_t len; + char *buf; +#ifdef HAVE_OPENSSL + int outlen, tmplen; + EVP_CIPHER_CTX ctx; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; + switch_uuid_t uuid; + + switch_uuid_get(&uuid); + switch_uuid_format(uuid_str, &uuid); + len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH; +#else + len = strlen(packet) + sizeof(globals.host_hash); +#endif + buf = malloc(len + 1); switch_assert(buf); memcpy(buf, &globals.host_hash, sizeof(globals.host_hash)); - switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash)); + +#ifdef HAVE_OPENSSL + if (globals.psk) { + switch_copy_string(buf + sizeof(globals.host_hash), uuid_str, SWITCH_UUID_FORMATTED_LENGTH); + + EVP_CIPHER_CTX_init(&ctx); + EVP_EncryptInit(&ctx, EVP_bf_cfb(), NULL, NULL); + EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk)); + EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str); + EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH, + &outlen, (unsigned char*) packet, (int) strlen(packet)); + EVP_EncryptFinal(&ctx, (unsigned char*) buf + outlen, &tmplen); + outlen += tmplen; + len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH; + } else { +#endif + switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash)); +#ifdef HAVE_OPENSSL + } +#endif + switch_socket_sendto(globals.udp_socket, globals.addr, 0, buf, &len); switch_safe_free(packet); switch_safe_free(buf);

1 0

[commit] r13825 - freeswitch/trunk/scripts
by FreeSWITCH SVN 17 Jun '09

17 Jun '09

Author: stkn Date: Wed Jun 17 18:11:19 2009 New Revision: 13825 Log: Add -days option to set expiration time of certificates in gentls_cert Modified: freeswitch/trunk/scripts/gentls_cert.in Modified: freeswitch/trunk/scripts/gentls_cert.in ============================================================================== --- freeswitch/trunk/scripts/gentls_cert.in (original) +++ freeswitch/trunk/scripts/gentls_cert.in Wed Jun 17 18:11:19 2009 @@ -155,6 +155,10 @@ shift OUTFILE="$1" ;; + -days) + shift + DAYS="$1" + ;; esac shift done @@ -197,6 +201,7 @@ -alt Set alternative name (use prefix 'DNS:' or 'URI:') -org Set organization name -out Filename for new certificate (create only) + -days Certificate expires in X days (default: 365) EOF exit 1

1 0

[commit] r13824 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 17 Jun '09

17 Jun '09

Author: mikej Date: Wed Jun 17 17:09:42 2009 New Revision: 13824 Log: fix mac build Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am Wed Jun 17 17:09:42 2009 @@ -34,7 +34,7 @@ mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mpf/include mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/apr-toolkit/include -mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA) +mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA) $(switch_builddir)/libs/apr/libapr-1.la mod_unimrcp_la_LDFLAGS = -avoid-version -module -no-undefined if ISMAC

1 0

[commit] r13823 - in freeswitch/trunk: . src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 17 Jun '09

17 Jun '09

Author: mikej Date: Wed Jun 17 16:40:22 2009 New Revision: 13823 Log: fix mac build Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am Removed: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed Jun 17 16:40:22 2009 @@ -747,6 +747,7 @@ src/Makefile src/mod/Makefile src/mod/endpoints/mod_sofia/Makefile + src/mod/asr_tts/mod_unimrcp/Makefile src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_python/Makefile Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am Wed Jun 17 16:40:22 2009 @@ -0,0 +1,50 @@ +MODNAME=mod_unimrcp + +AM_CFLAGS = $(SWITCH_AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) +#AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +# Dirty trick to override the link output +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi + +moddir=@modinstdir@ + +UNIMRCP_DIR=$(switch_builddir)/libs/unimrcp +UNIMRCPLA=$(UNIMRCP_DIR)/platforms/libunimrcp-client/libunimrcpclient.la + +mod_LTLIBRARIES = mod_unimrcp.la +mod_unimrcp_la_SOURCES = mod_unimrcp.c +mod_unimrcp_la_CFLAGS = $(AM_CFLAGS) +mod_unimrcp_la_CFLAGS += -I. +mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr/include +mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr-util/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/platforms/libunimrcp-client/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-sofiasip/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-unirtsp/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-client/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-signaling/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcpv2-transport/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/message/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/control/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/resources/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mpf/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/apr-toolkit/include + +mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA) +mod_unimrcp_la_LDFLAGS = -avoid-version -module -no-undefined + +if ISMAC +mod_unimrcp_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration +endif + +BUILT_SOURCES = $(UNIMRCPLA) + +$(UNIMRCPLA): $(UNIMRCP_DIR) $(UNIMRCP_DIR)/.update + cd $(UNIMRCP_DIR) && $(MAKE) + $(TOUCH_TARGET) + +$(mod_unimrcp_la_SOURCES) : $(BUILT_SOURCES)

1 0

[commit] r13822 - in freeswitch/trunk/libs/unimrcp: . platforms/unimrcp-client platforms/unimrcp-server
by FreeSWITCH SVN 17 Jun '09

17 Jun '09

Author: mikej Date: Wed Jun 17 16:39:38 2009 New Revision: 13822 Log: fix mac build Modified: freeswitch/trunk/libs/unimrcp/configure.ac freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am Modified: freeswitch/trunk/libs/unimrcp/configure.ac ============================================================================== --- freeswitch/trunk/libs/unimrcp/configure.ac (original) +++ freeswitch/trunk/libs/unimrcp/configure.ac Wed Jun 17 16:39:38 2009 @@ -108,6 +108,7 @@ AM_CONDITIONAL([DEMORECOG_PLUGIN],[test "${enable_demorecog_plugin}" = "yes"]) +AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) AC_CONFIG_FILES([ Makefile Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am ============================================================================== --- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am (original) +++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am Wed Jun 17 16:39:38 2009 @@ -22,3 +22,7 @@ src/demo_discover_application.c \ src/demo_util.c unimrcpclient_LDADD = $(top_builddir)/platforms/libunimrcp-client/libunimrcpclient.la + +if ISMAC +unimrcpclient_LDFLAGS = -framework CoreFoundation -framework SystemConfiguration +endif Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am ============================================================================== --- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am (original) +++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am Wed Jun 17 16:39:38 2009 @@ -17,3 +17,7 @@ bin_PROGRAMS = unimrcpserver unimrcpserver_SOURCES = src/main.c src/uni_cmdline.c src/uni_daemon.c unimrcpserver_LDADD = $(top_builddir)/platforms/libunimrcp-server/libunimrcpserver.la + +if ISMAC +unimrcpserver_LDFLAGS = -framework CoreFoundation -framework SystemConfiguration +endif

1 0

[commit] r13821 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 17 Jun '09

17 Jun '09

Author: andrew Date: Wed Jun 17 15:43:54 2009 New Revision: 13821 Log: Whoops Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile Wed Jun 17 15:43:54 2009 @@ -1,5 +1,5 @@ -LOCAL_CFLAGS= $(openssl_CFLAGS) -LOCAL_LDLAGS= $(openssl_LIBS) +LOCAL_CFLAGS= $(OPENSSL_CFLAGS) +LOCAL_LDLAGS= $(OPENSSL_LIBS) include ../../../../build/modmake.rules

1 0