tizen 2.4 release

diff --git a/LICENSE.Apache-2.0 b/LICENSE
similarity index 100%
rename from LICENSE.Apache-2.0
rename to LICENSE

diff --git a/NOTICE b/NOTICE
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/dukgenerator.pc.in b/dukgenerator.pc.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/dukgenerator.spec b/packaging/dukgenerator.spec
index 0821784..d38ed12 100644 (file)
--- a/packaging/dukgenerator.spec
+++ b/packaging/dukgenerator.spec
@@ -41,7 +41,7 @@ rm -f %{?buildroot:%{buildroot}}%{_infodir}/dir
 find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f --
 
 mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.Apache-2.0 %{buildroot}/usr/share/license/%{name}
+cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 
 %files

diff --git a/src/dukgen.c b/src/dukgen.c
old mode 100755 (executable)
new mode 100644 (file)
index 067ef47..2fdd4e1
--- a/src/dukgen.c
+++ b/src/dukgen.c
@@ -23,26 +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;
+       if (!(pUniqueKey = (unsigned char *)calloc(keyLen, 1)))
+               goto exit;
 
-       result = SecFrameGeneratePlatformUniqueKey((unsigned int)keyLen , pUniqueKey);
-       if(result == false)
-       {
-               free(pUniqueKey);
-               return NULL;
-       }
+       if (!SecFrameGeneratePlatformUniqueKey((unsigned int)keyLen , pUniqueKey))
+               goto exit;
 
-       pDuk = (char*)calloc(keyLen, 1);
-       PKCS5_PBKDF2_HMAC_SHA1(pAppId, idLen, (unsigned char*)pUniqueKey, keyLen, 1, keyLen, (unsigned char*)pDuk);
-       free(pUniqueKey);
+       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;
 }