From 72692c0fa83e0974e6b349e84d0647fad4db3f94 Mon Sep 17 00:00:00 2001 From: Dongsun Lee Date: Fri, 6 Nov 2015 09:21:28 +0900 Subject: [PATCH] synchronize with tizen 2.4 Change-Id: I459c4c0aeacec20bf8002d19d9e4b34b77a4e4b9 Signed-off-by: Dongsun Lee --- src/dukgen.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/dukgen.c b/src/dukgen.c index 6a76c68..2fdd4e1 100644 --- a/src/dukgen.c +++ b/src/dukgen.c @@ -23,30 +23,23 @@ #include #include -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; } -- 2.7.4