From: Seok Hong Date: Fri, 11 Nov 2016 07:12:27 +0000 (+0900) Subject: Add MD5 in KeyGenerator X-Git-Tag: submit/tizen/20170213.020148~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=338db048b0b7f8436c15730a287f6bcdb7c93d63;p=platform%2Fcore%2Fsecurity%2Fode.git Add MD5 in KeyGenerator Change-Id: I68ec322e950b0d8112ffe0b7feccee745c0c9eae Signed-off-by: Seok Hong --- diff --git a/packaging/ode.spec b/packaging/ode.spec index 87a83e4..3a734a3 100644 --- a/packaging/ode.spec +++ b/packaging/ode.spec @@ -16,6 +16,7 @@ BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(key-manager) BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) +BuildRequires: pkgconfig(openssl) %description The ode package provides a daemon which is responsible for encrypting/decryption storages and secure erasing. diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 6a6f5c3..d67cda9 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -33,6 +33,7 @@ SET(DEPENDENCY klay libtzplatform-config cynara-client cynara-session + openssl ) SET(SERVER_NAME ${PROJECT_NAME}d) diff --git a/server/key-manager/key-generator.cpp b/server/key-manager/key-generator.cpp index aad4128..f13723c 100644 --- a/server/key-manager/key-generator.cpp +++ b/server/key-manager/key-generator.cpp @@ -13,6 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License */ +#include + #include #include @@ -67,4 +69,13 @@ const KeyGenerator::data KeyGenerator::RNG() return ret; } +const KeyGenerator::data KeyGenerator::MD5(const KeyGenerator::data& in) +{ + data ret(MD5_DIGEST_LENGTH); + + ::MD5((unsigned char*)in.data(), in.size(), (unsigned char*)ret.data()); + + return ret; +} + } // namespace ode diff --git a/server/key-manager/key-generator.h b/server/key-manager/key-generator.h index b5b0d1a..e6ab147 100644 --- a/server/key-manager/key-generator.h +++ b/server/key-manager/key-generator.h @@ -37,6 +37,7 @@ public: const data AES(const data& in1, const data& in2); const data HMAC(const data& original, const data& key); const data RNG(); + const data MD5(const data& in); private: int keySize;