From 8504605b01177da2e55bee6abe4c3f20c82da379 Mon Sep 17 00:00:00 2001 From: Julius Marchwicki Date: Mon, 19 Aug 2013 14:07:11 -0400 Subject: Added OpenSSL patch and validated against 12.04 64-bit Incorporated patch for g++ 4.7 and newer compiler. Commented out two logging lines preventing compilation on 64-bit targets. --- SDL_Core/doc/install.txt | 2 + SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp | 14 +- .../V2/AudioCaptureQualityMarshaller.cpp | 2 +- .../V2/AudioCaptureQualityMarshaller.gp | 2 +- .../V2/AudioCaptureQualityMarshaller.inc | 6 +- SDL_Core/src/components/Utils/src/WorkWithOS.cpp | 1 + .../thirdPartyLibs/MessageBroker/CMakeLists.txt | 6 +- .../src/lib_messagebroker/websocket_handler.cpp | 184 +-------------------- 8 files changed, 27 insertions(+), 190 deletions(-) diff --git a/SDL_Core/doc/install.txt b/SDL_Core/doc/install.txt index 909365997..73587d432 100644 --- a/SDL_Core/doc/install.txt +++ b/SDL_Core/doc/install.txt @@ -25,6 +25,8 @@ To start web-based HMI we need web-browser with web-socket RFC6455 support. For example Google Chromium. Install it using: sudo apt-get install chromium-browser + Install openssl and development libraries: + sudo apt-get install openssl libssl-dev * Build application ================= diff --git a/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp b/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp index 6d58f4c07..4fada341a 100644 --- a/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp +++ b/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp @@ -6240,11 +6240,11 @@ namespace NsAppManager hmiApp.set_appId(app->getAppID()); hmiApp.set_isMediaApplication(app->getIsMediaApplication()); - std::map::const_iterator it = core->mDevices.find( app->getDeviceHandle() ); + std::map::const_iterator dev = core->mDevices.find( app->getDeviceHandle() ); std::string deviceName = ""; - if ( core->mDevices.end() != it ) + if ( core->mDevices.end() != dev ) { - deviceName = it->second.getUserFriendlyName(); + deviceName = dev->second.getUserFriendlyName(); } hmiApp.set_deviceName(deviceName); @@ -6782,8 +6782,8 @@ namespace NsAppManager application->setApplicationHMIStatusLevel(NsSmartDeviceLinkRPCV2::HMILevel::HMI_NONE); mApplications.insert( std::pair(appId, application) ); - LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << - " to mApplications " << (int)mApplications[appId]); + //LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << + // " to mApplications " << (int)mApplications[appId]); for( std::map::iterator it = mDevices.begin(); it != mDevices.end(); ++it ) @@ -6850,8 +6850,8 @@ namespace NsAppManager LOG4CPLUS_INFO_EXT(mLogger, "Application created." ); mApplications.insert( std::pair(appId, application) ); - LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << - " to mApplications " << (int)mApplications[appId]); + //LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << + // " to mApplications " << (int)mApplications[appId]); for( std::map::iterator it = mDevices.begin(); it != mDevices.end(); ++it ) diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp index 76b116369..d52185f72 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp @@ -52,7 +52,7 @@ const AudioCaptureQuality::AudioCaptureQualityInternal AudioCaptureQualityMarsha { if(!s) return AudioCaptureQuality::INVALID_ENUM; - const struct PerfectHashTable* p=AudioCaptureQuality_intHash::getPointer(s,strlen(s)); + const struct PerfectHashTable* p=AudioCaptureQualityV2_intHash::getPointer(s,strlen(s)); return p ? static_cast(p->idx) : AudioCaptureQuality::INVALID_ENUM; } diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp index 8ca8e9fc2..1e1a7c7b4 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp @@ -1,7 +1,7 @@ %language=C++ %struct-type %define lookup-function-name getPointer -%define class-name AudioCaptureQuality_intHash +%define class-name AudioCaptureQualityV2_intHash %omit-struct-type %readonly-tables %compare-strncmp diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc index 9098c1849..2a9f3e04f 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc @@ -42,7 +42,7 @@ #define MAX_HASH_VALUE 6 /* maximum key range = 2, duplicates = 0 */ -class AudioCaptureQuality_intHash +class AudioCaptureQualityV2_intHash { private: static inline unsigned int hash (const char *str, unsigned int len); @@ -52,13 +52,13 @@ public: inline /*ARGSUSED*/ unsigned int -AudioCaptureQuality_intHash::hash (register const char *str, register unsigned int len) +AudioCaptureQualityV2_intHash::hash (register const char *str, register unsigned int len) { return len; } const struct NsSmartDeviceLinkRPCV2::PerfectHashTable * -AudioCaptureQuality_intHash::getPointer (register const char *str, register unsigned int len) +AudioCaptureQualityV2_intHash::getPointer (register const char *str, register unsigned int len) { static const unsigned char lengthtable[] = { diff --git a/SDL_Core/src/components/Utils/src/WorkWithOS.cpp b/SDL_Core/src/components/Utils/src/WorkWithOS.cpp index 8bc1cd4e4..46995fcd4 100644 --- a/SDL_Core/src/components/Utils/src/WorkWithOS.cpp +++ b/SDL_Core/src/components/Utils/src/WorkWithOS.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include "Utils/WorkWithOS.h" unsigned long int WorkWithOS::getAvailableSpace() diff --git a/SDL_Core/src/thirdPartyLibs/MessageBroker/CMakeLists.txt b/SDL_Core/src/thirdPartyLibs/MessageBroker/CMakeLists.txt index 1d8671144..9c9f642cf 100644 --- a/SDL_Core/src/thirdPartyLibs/MessageBroker/CMakeLists.txt +++ b/SDL_Core/src/thirdPartyLibs/MessageBroker/CMakeLists.txt @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 2.8) + include_directories ( ./include/ ../jsoncpp/include @@ -23,10 +25,12 @@ set (MESSAGE_BROKER_SERVER_SOURCES ./src/server/networking.cpp ) +find_package(OpenSSL REQUIRED) + add_library("MessageBroker" ${MESSAGE_BROKER_SOURCES}) add_library("MessageBrokerClient" ${MESSAGE_BROKER_CLIENT_SOURCES}) target_link_libraries("MessageBrokerClient" "MessageBroker") add_library("MessageBrokerServer" ${MESSAGE_BROKER_SERVER_SOURCES}) -target_link_libraries("MessageBrokerServer" "MessageBroker") \ No newline at end of file +target_link_libraries("MessageBrokerServer" "MessageBroker" ${OPENSSL_LIBRARIES}) diff --git a/SDL_Core/src/thirdPartyLibs/MessageBroker/src/lib_messagebroker/websocket_handler.cpp b/SDL_Core/src/thirdPartyLibs/MessageBroker/src/lib_messagebroker/websocket_handler.cpp index aa14ec3df..8dcd83f5c 100644 --- a/SDL_Core/src/thirdPartyLibs/MessageBroker/src/lib_messagebroker/websocket_handler.cpp +++ b/SDL_Core/src/thirdPartyLibs/MessageBroker/src/lib_messagebroker/websocket_handler.cpp @@ -19,6 +19,9 @@ #include "libMBDebugHelper.h" #include "md5.h" +#include + + namespace NsMessageBroker { int CWebSocketHandler::parseWebSocketData(char* Buffer, unsigned int& b_size) @@ -176,186 +179,13 @@ namespace NsMessageBroker key = accept_buf; } - void CWebSocketHandler::sha1_step(struct sha1_ctxt *ctxt) - { - unsigned long a, b, c, d, e; - size_t t, s; - unsigned long tmp; - - struct sha1_ctxt tctxt; - - memcpy(&tctxt.m.b8[0], &ctxt->m.b8[0], 64); - ctxt->m.b8[0] = tctxt.m.b8[3]; ctxt->m.b8[1] = tctxt.m.b8[2]; - ctxt->m.b8[2] = tctxt.m.b8[1]; ctxt->m.b8[3] = tctxt.m.b8[0]; - ctxt->m.b8[4] = tctxt.m.b8[7]; ctxt->m.b8[5] = tctxt.m.b8[6]; - ctxt->m.b8[6] = tctxt.m.b8[5]; ctxt->m.b8[7] = tctxt.m.b8[4]; - ctxt->m.b8[8] = tctxt.m.b8[11]; ctxt->m.b8[9] = tctxt.m.b8[10]; - ctxt->m.b8[10] = tctxt.m.b8[9]; ctxt->m.b8[11] = tctxt.m.b8[8]; - ctxt->m.b8[12] = tctxt.m.b8[15]; ctxt->m.b8[13] = tctxt.m.b8[14]; - ctxt->m.b8[14] = tctxt.m.b8[13]; ctxt->m.b8[15] = tctxt.m.b8[12]; - ctxt->m.b8[16] = tctxt.m.b8[19]; ctxt->m.b8[17] = tctxt.m.b8[18]; - ctxt->m.b8[18] = tctxt.m.b8[17]; ctxt->m.b8[19] = tctxt.m.b8[16]; - ctxt->m.b8[20] = tctxt.m.b8[23]; ctxt->m.b8[21] = tctxt.m.b8[22]; - ctxt->m.b8[22] = tctxt.m.b8[21]; ctxt->m.b8[23] = tctxt.m.b8[20]; - ctxt->m.b8[24] = tctxt.m.b8[27]; ctxt->m.b8[25] = tctxt.m.b8[26]; - ctxt->m.b8[26] = tctxt.m.b8[25]; ctxt->m.b8[27] = tctxt.m.b8[24]; - ctxt->m.b8[28] = tctxt.m.b8[31]; ctxt->m.b8[29] = tctxt.m.b8[30]; - ctxt->m.b8[30] = tctxt.m.b8[29]; ctxt->m.b8[31] = tctxt.m.b8[28]; - ctxt->m.b8[32] = tctxt.m.b8[35]; ctxt->m.b8[33] = tctxt.m.b8[34]; - ctxt->m.b8[34] = tctxt.m.b8[33]; ctxt->m.b8[35] = tctxt.m.b8[32]; - ctxt->m.b8[36] = tctxt.m.b8[39]; ctxt->m.b8[37] = tctxt.m.b8[38]; - ctxt->m.b8[38] = tctxt.m.b8[37]; ctxt->m.b8[39] = tctxt.m.b8[36]; - ctxt->m.b8[40] = tctxt.m.b8[43]; ctxt->m.b8[41] = tctxt.m.b8[42]; - ctxt->m.b8[42] = tctxt.m.b8[41]; ctxt->m.b8[43] = tctxt.m.b8[40]; - ctxt->m.b8[44] = tctxt.m.b8[47]; ctxt->m.b8[45] = tctxt.m.b8[46]; - ctxt->m.b8[46] = tctxt.m.b8[45]; ctxt->m.b8[47] = tctxt.m.b8[44]; - ctxt->m.b8[48] = tctxt.m.b8[51]; ctxt->m.b8[49] = tctxt.m.b8[50]; - ctxt->m.b8[50] = tctxt.m.b8[49]; ctxt->m.b8[51] = tctxt.m.b8[48]; - ctxt->m.b8[52] = tctxt.m.b8[55]; ctxt->m.b8[53] = tctxt.m.b8[54]; - ctxt->m.b8[54] = tctxt.m.b8[53]; ctxt->m.b8[55] = tctxt.m.b8[52]; - ctxt->m.b8[56] = tctxt.m.b8[59]; ctxt->m.b8[57] = tctxt.m.b8[58]; - ctxt->m.b8[58] = tctxt.m.b8[57]; ctxt->m.b8[59] = tctxt.m.b8[56]; - ctxt->m.b8[60] = tctxt.m.b8[63]; ctxt->m.b8[61] = tctxt.m.b8[62]; - ctxt->m.b8[62] = tctxt.m.b8[61]; ctxt->m.b8[63] = tctxt.m.b8[60]; - - a = H(0); b = H(1); c = H(2); d = H(3); e = H(4); - - for (t = 0; t < 20; t++) - { - s = t & 0x0f; - if (t >= 16) - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - - tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 20; t < 40; t++) - { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 40; t < 60; t++) - { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 60; t < 80; t++) - { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - - H(0) = H(0) + a; - H(1) = H(1) + b; - H(2) = H(2) + c; - H(3) = H(3) + d; - H(4) = H(4) + e; - - memset(&ctxt->m.b8[0], 0, 64); - } - - void CWebSocketHandler::sha1_init(struct sha1_ctxt *ctxt) - { - memset(ctxt, 0, sizeof(struct sha1_ctxt)); - H(0) = 0x67452301; - H(1) = 0xefcdab89; - H(2) = 0x98badcfe; - H(3) = 0x10325476; - H(4) = 0xc3d2e1f0; - } - - void CWebSocketHandler::sha1_pad(struct sha1_ctxt *ctxt) - { - size_t padlen; /*pad length in bytes*/ - size_t padstart; - - PUTPAD(0x80); - - padstart = COUNT % 64; - padlen = 64 - padstart; - if (padlen < 8) - { - memset(&ctxt->m.b8[padstart], 0, padlen); - COUNT += padlen; - COUNT %= 64; - sha1_step(ctxt); - padstart = COUNT % 64; /* should be 0 */ - padlen = 64 - padstart; /* should be 64 */ - } - memset(&ctxt->m.b8[padstart], 0, padlen - 8); - COUNT += (padlen - 8); - COUNT %= 64; - - PUTPAD(ctxt->c.b8[7]); PUTPAD(ctxt->c.b8[6]); - PUTPAD(ctxt->c.b8[5]); PUTPAD(ctxt->c.b8[4]); - PUTPAD(ctxt->c.b8[3]); PUTPAD(ctxt->c.b8[2]); - PUTPAD(ctxt->c.b8[1]); PUTPAD(ctxt->c.b8[0]); - } - - void CWebSocketHandler::sha1_loop(struct sha1_ctxt *ctxt, const unsigned char *input, size_t len) - { - size_t gaplen; - size_t gapstart; - size_t off; - size_t copysiz; - - off = 0; - - while (off < len) - { - gapstart = COUNT % 64; - gaplen = 64 - gapstart; - - copysiz = (gaplen < len - off) ? gaplen : len - off; - memcpy(&ctxt->m.b8[gapstart], &input[off], copysiz); - COUNT += copysiz; - COUNT %= 64; - ctxt->c.b64[0] += copysiz * 8; - if (COUNT % 64 == 0) - sha1_step(ctxt); - off += copysiz; - } - } - - void CWebSocketHandler::sha1_result(struct sha1_ctxt *ctxt, unsigned char* digest0) - { - unsigned char *digest; - - digest = (unsigned char *)digest0; - sha1_pad(ctxt); - digest[0] = ctxt->h.b8[3]; digest[1] = ctxt->h.b8[2]; - digest[2] = ctxt->h.b8[1]; digest[3] = ctxt->h.b8[0]; - digest[4] = ctxt->h.b8[7]; digest[5] = ctxt->h.b8[6]; - digest[6] = ctxt->h.b8[5]; digest[7] = ctxt->h.b8[4]; - digest[8] = ctxt->h.b8[11]; digest[9] = ctxt->h.b8[10]; - digest[10] = ctxt->h.b8[9]; digest[11] = ctxt->h.b8[8]; - digest[12] = ctxt->h.b8[15]; digest[13] = ctxt->h.b8[14]; - digest[14] = ctxt->h.b8[13]; digest[15] = ctxt->h.b8[12]; - digest[16] = ctxt->h.b8[19]; digest[17] = ctxt->h.b8[18]; - digest[18] = ctxt->h.b8[17]; digest[19] = ctxt->h.b8[16]; - } - - /* - * This should look and work like the libcrypto implementation - */ - unsigned char * CWebSocketHandler::SHA1(const unsigned char *d, size_t n, unsigned char *md) { - struct sha1_ctxt ctx; + SHA_CTX ctx; - sha1_init(&ctx); - sha1_loop(&ctx, d, n); - sha1_result(&ctx, (unsigned char*)md); + SHA1_Init(&ctx); + SHA1_Update(&ctx, d, n); + SHA1_Final((unsigned char *)md, &ctx); return md; } -- cgit v1.2.1