synchronize with tizen 2.4

Change-Id: I459c4c0aeacec20bf8002d19d9e4b34b77a4e4b9
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --git a/src/dukgen.c b/src/dukgen.c
index 6a76c68..2fdd4e1 100644 (file)
--- a/src/dukgen.c
+++ b/src/dukgen.c
@@ -23,30 +23,23 @@
 #include <SecCryptoSvc.h>
 #include <dukgen.h>
 
-char* GetDeviceUniqueKey(char* pAppId, int idLen, int keyLen)
+char *GetDeviceUniqueKey(char *pAppId, int idLen, int keyLen)
 {
-       unsigned char* pUniqueKey = NULL;
-       char* pDuk = NULL;
-       bool result = true;
+       unsigned char *pUniqueKey = NULL;
+       char *pDuk = NULL;
 
-       pUniqueKey = (unsigned char*)calloc(keyLen,1);
-       if (pUniqueKey == NULL)
-               return NULL;
-       result = SecFrameGeneratePlatformUniqueKey((unsigned int)keyLen , pUniqueKey);
-       if(result == false)
-       {
-               free(pUniqueKey);
-               return NULL;
-       }
+       if (!(pUniqueKey = (unsigned char *)calloc(keyLen, 1)))
+               goto exit;
 
-       pDuk = (char*)calloc(keyLen, 1);
-       if (pDuk == NULL)
-       {
-               free(pUniqueKey);
-               return NULL;
-       }
-       PKCS5_PBKDF2_HMAC_SHA1(pAppId, idLen, (unsigned char*)pUniqueKey, keyLen, 1, keyLen, (unsigned char*)pDuk);
-       free(pUniqueKey);
+       if (!SecFrameGeneratePlatformUniqueKey((unsigned int)keyLen , pUniqueKey))
+               goto exit;
+
+       if (!(pDuk = (char *)calloc(keyLen, 1)))
+               goto exit;
 
+       PKCS5_PBKDF2_HMAC_SHA1(pAppId, idLen, (unsigned char *)pUniqueKey, keyLen, 1, keyLen, (unsigned char *)pDuk);
+
+exit:
+       free(pUniqueKey);
        return pDuk;
 }