Removed libsafec dependency since source for libsafec was taken down.

Mandeep Shetty · Erich Keane · commit 0ec3a09a026e · 2015-07-17T19:42:34.000Z
The sourceforge site taken down. Removed the dependancy since the xmpp lib was needed for remote access. This issue is tracked in IOT-617. Change-Id: I709871b06bd7bd957654f94361812519abd2305c Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/1705 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com> Reviewed-by: Erich Keane <erich.keane@intel.com>
diff --git a/build_common/SConscript.py b/build_common/SConscript.py
@@ -233,7 +233,7 @@ def versionSufficient(sourceVer, requiredVer):
 if 'linux' in env['HOST']:
     # Check g++ version (GCC C-version shouldn't matter as much, but can be checked too
     # here if needed)
-    REQUIRED_VER = "4.6.2"
+    REQUIRED_VER = "4.6"
     # Check gcc version
     if  not versionSufficient(env['CXXVERSION'], REQUIRED_VER):
         print "g++ version is insufficient to compile the client. Required:", REQUIRED_VER, " Found:", env['CXXVERSION']
diff --git a/external/SConscript.py b/external/SConscript.py
@@ -21,10 +21,10 @@
 Import('env')
 
 # Windows does not require safec, as the functions used are present in its C standard library
-if env['PLATFORM'] not in ['win']:
-    SConscript([
-               'safec/SConscript.py',
-               ], duplicate = 0)
+# if env['PLATFORM'] not in ['win']:
+#     SConscript([
+#                'safec/SConscript.py',
+#                ], duplicate = 0)
 
 SConscript([
            'asio/SConscript.py',
diff --git a/ra_xmpp/SConscript.py b/ra_xmpp/SConscript.py
@@ -53,7 +53,7 @@
             ],
             LIBS = ['strophe'])
     ra_xmpp_env.Append(
-        LIBS = ['ccfxmpp','safec-1.0','pthread'],
+        LIBS = ['ccfxmpp','pthread'],
         LIBPATH = ['#src']
         )
 
diff --git a/ra_xmpp/c_init_test/SConscript.py b/ra_xmpp/c_init_test/SConscript.py
@@ -46,7 +46,7 @@
             ],
             LIBS = ['strophe'])
     ra_xmpp_test_env.Append(
-        LIBS = ['ra_xmpp', 'ccfxmpp', 'safec-1.0', 'curl']
+        LIBS = ['ra_xmpp', 'ccfxmpp', 'curl']
         )
     ra_xmpp_test_env.AppendUnique(
         LIBPATH = [
diff --git a/ra_xmpp/ra_xmpp.c b/ra_xmpp/ra_xmpp.c
@@ -53,8 +53,10 @@
 #include <errno.h>
 
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
+#endif
 #else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -247,7 +249,7 @@ char *const clone_c_str(const char *const str)
         char *const cloned_str = malloc(str_len + 1);
         if (cloned_str)
         {
-            memmove_s(cloned_str, str_len, str, str_len);
+            memmove(cloned_str, str, str_len);
             cloned_str[str_len] = 0;
 
             return cloned_str;
@@ -284,9 +286,9 @@ void xmpp_context_init(xmpp_context_t *const context)
     if (context)
     {
 #if (defined(__STDC_WANT_LIB_EXT1__) && (__STDC_WANT_LIB_EXT1__ >= 1))
-        memset_s(context, sizeof(*context), 0, sizeof(*context));
+        memset_s(context, sizeof (*context), 0, sizeof(*context));
 #else
-        memset_s(context, sizeof(*context), 0);
+        memset(context, 0, sizeof(*context));
 #endif
         context->cb = sizeof(*context);
     }
@@ -303,7 +305,7 @@ xmpp_context_t *clone_context(const xmpp_context_t *context)
     xmpp_context_t *cloned_context = calloc(1, sizeof(*context));
     if (cloned_context)
     {
-        memmove_s(cloned_context, sizeof(*cloned_context), context, sizeof(*context));
+        memmove(cloned_context, context, sizeof(*context));
     }
     return cloned_context;
 }
@@ -318,7 +320,7 @@ void xmpp_host_init(xmpp_host_t *const host, const char *const host_name,
 #if (defined(__STDC_WANT_LIB_EXT1__) && (__STDC_WANT_LIB_EXT1__ >= 1))
         memset_s(host, sizeof(*host), 0, sizeof(*host));
 #else
-        memset_s(host, sizeof(*host), 0);
+        memset(host, 0, sizeof(*host));
 #endif
         host->cb = sizeof(*host);
 
@@ -353,9 +355,9 @@ void xmpp_identity_init(xmpp_identity_t *const identity, const char *const user_
     if (identity)
     {
 #if (defined(__STDC_WANT_LIB_EXT1__) && (__STDC_WANT_LIB_EXT1__ >= 1))
-        memset_s(identity, sizeof(*identity), 0, sizeof(*identity));
+        memset_s(identity, sizeof (*identity), 0, sizeof(*identity));
 #else
-        memset_s(identity, sizeof(*identity), 0);
+        memset(identity, 0, sizeof(*identity));
 #endif
         identity->cb = sizeof(*identity);
 
@@ -392,7 +394,7 @@ void xmpp_proxy_init(xmpp_proxy_t *const proxy, const char *const host,
 #if (defined(__STDC_WANT_LIB_EXT1__) && (__STDC_WANT_LIB_EXT1__ >= 1))
         memset_s(proxy, sizeof(*proxy), 0, sizeof(*proxy));
 #else
-        memset_s(proxy, sizeof(*proxy), 0);
+        memset(proxy, 0, sizeof(*proxy));
 #endif
 
 
diff --git a/ra_xmpp/test/SConscript.py b/ra_xmpp/test/SConscript.py
@@ -47,7 +47,7 @@
             ],
             LIBS = ['strophe'])
     ra_xmpp_test_env.Append(
-        LIBS = ['ra_xmpp', 'ccfxmpp', 'gtest', 'safec-1.0', 'pthread', 'curl']
+        LIBS = ['ra_xmpp', 'ccfxmpp', 'gtest', 'pthread', 'curl']
         )
     ra_xmpp_test_env.AppendUnique(
         LIBPATH = [
diff --git a/src/common/bufferencrypt.cpp b/src/common/bufferencrypt.cpp
@@ -29,15 +29,18 @@
 #include "rand_helper.h"
 #include <openssl/evp.h>
 #include <stdint.h>
+#include <string.h>
 #include <limits>
 #include <algorithm>
 
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 #ifdef _WIN32
@@ -225,7 +228,7 @@ namespace Iotivity
             // Otherwise clear out the memory.
             ::SecureZeroMemory(ptr(), allocatedSize());
 #  else
-            ::memset_s(ptr(), allocatedSize(), 0);
+            ::memset(ptr(), 0, allocatedSize());
 #  endif
 #endif
 
@@ -278,7 +281,7 @@ namespace Iotivity
                             newBufferRealSize - DEBUG_BYTE_BUFFER_GUARD_REGION_SIZE,
                             ptr(), std::min(newBufferRealSize, allocatedSize()));
 #else
-                ::memmove_s(newPtr, newBufferRealSize, ptr(), std::min(newBufferRealSize, allocatedSize()));
+                ::memmove(newPtr, ptr(), std::min(newBufferRealSize, allocatedSize()));
 #endif
                 freeBufferSecure();
 
diff --git a/src/common/buffers.cpp b/src/common/buffers.cpp
@@ -48,9 +48,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 #ifdef WINCE
@@ -777,7 +779,7 @@ namespace Iotivity
         if (buf && size && m_position < this->size())
         {
             bytesRead = std::min(size, this->size() - m_position);
-            memcpy_s(buf, size, &((unsigned char *)ptr())[m_position], bytesRead);
+            memcpy(buf, &((unsigned char *)ptr())[m_position], bytesRead);
             m_position += bytesRead;
         }
         return bytesRead;
@@ -814,7 +816,7 @@ namespace Iotivity
                 // the position.
                 if (buf)
                 {
-                    memcpy_s(&((unsigned char *)ptr())[m_position], size, buf, size);
+                    memcpy(&((unsigned char *)ptr())[m_position], buf, size);
                 }
                 m_position += size;
                 appended = true;
diff --git a/src/xml/portabledom.cpp b/src/xml/portabledom.cpp
@@ -45,9 +45,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 using namespace std;
@@ -602,7 +604,7 @@ namespace Iotivity
             m_sourceStr = m_sourceDoc.allocate_string(0, size + 1);
             if (m_sourceStr)
             {
-                memcpy_s(m_sourceStr, size, (const void *)utf8SrcBuffer, size);
+                memcpy(m_sourceStr, (const void *)utf8SrcBuffer, size);
                 m_sourceStr[size] = 0;
                 m_sourceDoc.parse(m_sourceStr, bytesRead, parse_stop_at_next_sibling);
                 outNode = documentElement();
@@ -627,7 +629,7 @@ namespace Iotivity
             m_sourceStr = m_sourceDoc.allocate_string(0, size + 1);
             if (m_sourceStr)
             {
-                memcpy_s(m_sourceStr, size, (const void *)utf8SrcBuffer, size);
+                memcpy(m_sourceStr, (const void *)utf8SrcBuffer, size);
                 m_sourceStr[size] = 0;
                 m_sourceDoc.parse(m_sourceStr, ending == EndingTest::IgnoreEnding ?
                                   parse_default : parse_validate_closing_tags);
diff --git a/test/SConscript.py b/test/SConscript.py
@@ -51,7 +51,7 @@
     # We use append rather than appendunique to force certain dynamic libraries to appear
     # after the static libraries. This does result in duplication on the command line.
     ccfxmpp_tests_env.Append(
-        LIBS = [ccfxmpplib, 'gmock', 'gtest', 'curl', 'ssl', 'pthread', 'crypto', 'safec-1.0'],
+        LIBS = [ccfxmpplib, 'gmock', 'gtest', 'curl', 'ssl', 'pthread', 'crypto'],
         )
     ccfxmpp_tests_env.AppendUnique(
         LIBPATH = [
diff --git a/test/ping_tests.cpp b/test/ping_tests.cpp
@@ -37,8 +37,10 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
+#endif
 #endif //WIN32
 }
 
diff --git a/test/pubsub_tests.cpp b/test/pubsub_tests.cpp
@@ -33,8 +33,10 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
+#endif
 #endif //WIN32
 }
 
diff --git a/test/register_tests.cpp b/test/register_tests.cpp
@@ -36,9 +36,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 
diff --git a/test/servicedisc_tests.cpp b/test/servicedisc_tests.cpp
@@ -36,9 +36,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 
diff --git a/test/xmpp_compliance_tests.cpp b/test/xmpp_compliance_tests.cpp
@@ -41,9 +41,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 using namespace std;
diff --git a/test/xmpp_dummy_server.cpp b/test/xmpp_dummy_server.cpp
@@ -46,9 +46,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 
@@ -166,7 +168,7 @@ void SegmentedDummyTCPConnect::async_receive(std::shared_ptr<ByteBuffer> buffer,
             //       smaller too, but this should not affect normal operation.
             throw runtime_error("Insufficient buffer for simulated read request");
         }
-        memcpy_s(buffer->get(), buffer->size(), currentData.c_str(), currentData.size());
+        memcpy(buffer->get(), currentData.c_str(), buffer->size());
         nextAction();
         f(connect_error::SUCCESS, currentData.size());
     }
@@ -269,7 +271,7 @@ void SegmentedDummyTCPConnect::async_receive(std::shared_ptr<ByteBuffer> buffer,
         {
             throw runtime_error("Insufficient buffer for simulated read request");
         }
-        memcpy_s(buffer->get(), buffer->size(), currentData.c_str(), currentData.size());
+        memcpy(buffer->get(), currentData.c_str(), buffer->size());
         nextAction();
         f(connect_error::SUCCESS, currentData.size());
 #else
diff --git a/test/xmpp_tests.cpp b/test/xmpp_tests.cpp
@@ -51,9 +51,11 @@
 extern "C"
 {
 #if !defined(_WIN32)
+#ifdef WITH_SAFE
 #include <safe_mem_lib.h>
 #include <safe_str_lib.h>
 #endif
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`],`
`54`	`54`	`LIBS = ['strophe'])`
`55`	`55`	`ra_xmpp_env.Append(`
`56`		`- LIBS = ['ccfxmpp','safec-1.0','pthread'],`
	`56`	`+ LIBS = ['ccfxmpp','pthread'],`
`57`	`57`	`LIBPATH = ['#src']`
`58`	`58`	`)`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`],`
`47`	`47`	`LIBS = ['strophe'])`
`48`	`48`	`ra_xmpp_test_env.Append(`
`49`		`- LIBS = ['ra_xmpp', 'ccfxmpp', 'safec-1.0', 'curl']`
	`49`	`+ LIBS = ['ra_xmpp', 'ccfxmpp', 'curl']`
`50`	`50`	`)`
`51`	`51`	`ra_xmpp_test_env.AppendUnique(`
`52`	`52`	`LIBPATH = [`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`],`
`48`	`48`	`LIBS = ['strophe'])`
`49`	`49`	`ra_xmpp_test_env.Append(`
`50`		`- LIBS = ['ra_xmpp', 'ccfxmpp', 'gtest', 'safec-1.0', 'pthread', 'curl']`
	`50`	`+ LIBS = ['ra_xmpp', 'ccfxmpp', 'gtest', 'pthread', 'curl']`
`51`	`51`	`)`
`52`	`52`	`ra_xmpp_test_env.AppendUnique(`
`53`	`53`	`LIBPATH = [`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,11 @@`
`48`	`48`	`extern "C"`
`49`	`49`	`{`
`50`	`50`	`#if !defined(_WIN32)`
	`51`	`+#ifdef WITH_SAFE`
`51`	`52`	`#include <safe_mem_lib.h>`
`52`	`53`	`#include <safe_str_lib.h>`
`53`	`54`	`#endif`
	`55`	`+#endif`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`#ifdef WINCE`
`@@ -777,7 +779,7 @@ namespace Iotivity`
`777`	`779`	`if (buf && size && m_position < this->size())`
`778`	`780`	`{`
`779`	`781`	`bytesRead = std::min(size, this->size() - m_position);`
`780`		`- memcpy_s(buf, size, &((unsigned char *)ptr())[m_position], bytesRead);`
	`782`	`+ memcpy(buf, &((unsigned char *)ptr())[m_position], bytesRead);`
`781`	`783`	`m_position += bytesRead;`
`782`	`784`	`}`
`783`	`785`	`return bytesRead;`
`@@ -814,7 +816,7 @@ namespace Iotivity`
`814`	`816`	`// the position.`
`815`	`817`	`if (buf)`
`816`	`818`	`{`
`817`		`- memcpy_s(&((unsigned char *)ptr())[m_position], size, buf, size);`
	`819`	`+ memcpy(&((unsigned char *)ptr())[m_position], buf, size);`
`818`	`820`	`}`
`819`	`821`	`m_position += size;`
`820`	`822`	`appended = true;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`# We use append rather than appendunique to force certain dynamic libraries to appear`
`52`	`52`	`# after the static libraries. This does result in duplication on the command line.`
`53`	`53`	`ccfxmpp_tests_env.Append(`
`54`		`- LIBS = [ccfxmpplib, 'gmock', 'gtest', 'curl', 'ssl', 'pthread', 'crypto', 'safec-1.0'],`
	`54`	`+ LIBS = [ccfxmpplib, 'gmock', 'gtest', 'curl', 'ssl', 'pthread', 'crypto'],`
`55`	`55`	`)`
`56`	`56`	`ccfxmpp_tests_env.AppendUnique(`
`57`	`57`	`LIBPATH = [`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@`
`37`	`37`	`extern "C"`
`38`	`38`	`{`
`39`	`39`	`#if !defined(_WIN32)`
	`40`	`+#ifdef WITH_SAFE`
`40`	`41`	`#include <safe_mem_lib.h>`
`41`	`42`	`#include <safe_str_lib.h>`
	`43`	`+#endif`
`42`	`44`	`#endif //WIN32`
`43`	`45`	`}`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,10 @@`
`33`	`33`	`extern "C"`
`34`	`34`	`{`
`35`	`35`	`#if !defined(_WIN32)`
	`36`	`+#ifdef WITH_SAFE`
`36`	`37`	`#include <safe_mem_lib.h>`
`37`	`38`	`#include <safe_str_lib.h>`
	`39`	`+#endif`
`38`	`40`	`#endif //WIN32`
`39`	`41`	`}`
`40`	`42`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,11 @@`
`36`	`36`	`extern "C"`
`37`	`37`	`{`
`38`	`38`	`#if !defined(_WIN32)`
	`39`	`+#ifdef WITH_SAFE`
`39`	`40`	`#include <safe_mem_lib.h>`
`40`	`41`	`#include <safe_str_lib.h>`
`41`	`42`	`#endif`
	`43`	`+#endif`
`42`	`44`	`}`
`43`	`45`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,11 @@`
`41`	`41`	`extern "C"`
`42`	`42`	`{`
`43`	`43`	`#if !defined(_WIN32)`
	`44`	`+#ifdef WITH_SAFE`
`44`	`45`	`#include <safe_mem_lib.h>`
`45`	`46`	`#include <safe_str_lib.h>`
`46`	`47`	`#endif`
	`48`	`+#endif`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`using namespace std;`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,11 @@`
`46`	`46`	`extern "C"`
`47`	`47`	`{`
`48`	`48`	`#if !defined(_WIN32)`
	`49`	`+#ifdef WITH_SAFE`
`49`	`50`	`#include <safe_mem_lib.h>`
`50`	`51`	`#include <safe_str_lib.h>`
`51`	`52`	`#endif`
	`53`	`+#endif`
`52`	`54`	`}`
`53`	`55`
`54`	`56`
`@@ -166,7 +168,7 @@ void SegmentedDummyTCPConnect::async_receive(std::shared_ptr<ByteBuffer> buffer,`
`166`	`168`	`// smaller too, but this should not affect normal operation.`
`167`	`169`	`throw runtime_error("Insufficient buffer for simulated read request");`
`168`	`170`	`}`
`169`		`- memcpy_s(buffer->get(), buffer->size(), currentData.c_str(), currentData.size());`
	`171`	`+ memcpy(buffer->get(), currentData.c_str(), buffer->size());`
`170`	`172`	`nextAction();`
`171`	`173`	`f(connect_error::SUCCESS, currentData.size());`
`172`	`174`	`}`
`@@ -269,7 +271,7 @@ void SegmentedDummyTCPConnect::async_receive(std::shared_ptr<ByteBuffer> buffer,`
`269`	`271`	`{`
`270`	`272`	`throw runtime_error("Insufficient buffer for simulated read request");`
`271`	`273`	`}`
`272`		`- memcpy_s(buffer->get(), buffer->size(), currentData.c_str(), currentData.size());`
	`274`	`+ memcpy(buffer->get(), currentData.c_str(), buffer->size());`
`273`	`275`	`nextAction();`
`274`	`276`	`f(connect_error::SUCCESS, currentData.size());`
`275`	`277`	`#else`