Remove MD5 from key-generator

 - delete MD5 method from key-generator
 - replace 'MD5' to 'SHA256' which is used to get hash value

Change-Id: I788a38adbcc34d29061f85cc87f5fee1e1eea26b
Signed-off-by: s414kim <s414.kim@samsung.com>

diff --git a/server/file-footer.cpp b/server/file-footer.cpp
index c1bc23b..a8a12d6 100644 (file)
--- a/server/file-footer.cpp
+++ b/server/file-footer.cpp
@@ -31,7 +31,7 @@ namespace {
 
 const std::string getFileName(const std::string &key)
 {
-       KeyGenerator::data hash = KeyGenerator::MD5(KeyGenerator::data(key.begin(), key.end()));
+       KeyGenerator::data hash = KeyGenerator::SHA256(KeyGenerator::data(key.begin(), key.end()));
        std::stringstream fileName;
 
        fileName << "/opt/etc/.ode_";

diff --git a/server/key-manager/key-generator.cpp b/server/key-manager/key-generator.cpp
index 6f089e3..d68c7ff 100644 (file)
--- a/server/key-manager/key-generator.cpp
+++ b/server/key-manager/key-generator.cpp
@@ -13,7 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-#include <openssl/md5.h>
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 #include <openssl/hmac.h>
@@ -40,16 +39,11 @@
 #error This requires SHA512
 #endif
 
-#ifdef OPENSSL_NO_MD5
-#error This requires MD5
-#endif
-
 namespace ode {
 
 void KeyGenerator::init()
 {
        EVP_add_cipher(EVP_aes_256_cbc());
-       EVP_add_digest(EVP_md5());
        EVP_add_digest(EVP_sha256());
        EVP_add_digest(EVP_sha512());
 }
@@ -136,15 +130,6 @@ const KeyGenerator::data KeyGenerator::RNG(size_t resultSize)
        return ret;
 }
 
-const KeyGenerator::data KeyGenerator::MD5(const data& in)
-{
-       data ret(128 / 8);
-
-       ::MD5(in.data(), in.size(), ret.data());
-
-       return ret;
-}
-
 const KeyGenerator::data KeyGenerator::SHA256(const data& in)
 {
     data ret(256 / 8);

diff --git a/server/key-manager/key-generator.h b/server/key-manager/key-generator.h
index 00a8dda..f804144 100644 (file)
--- a/server/key-manager/key-generator.h
+++ b/server/key-manager/key-generator.h
@@ -40,7 +40,6 @@ public:
        static const data AESDecrypt(const data& in, const data& key, const data& iv);
        static const data HMAC(const data& in, const data& key);
        static const data RNG(size_t resultSize);
-       static const data MD5(const data& in);
        static const data SHA256(const data& in);
        static const data SHA512(const data& in);
 };

diff --git a/server/key-manager/key-store.cpp b/server/key-manager/key-store.cpp
index 53b7524..d5f8e38 100644 (file)
--- a/server/key-manager/key-store.cpp
+++ b/server/key-manager/key-store.cpp
@@ -15,7 +15,6 @@
  */
 #include <fcntl.h>
 #include <arpa/inet.h>
-#include <openssl/md5.h>
 
 #include <algorithm>