Merge "Fix for SATIZENVUL-1655 & SATIZENVUL-1656 - error handling" into tizen

diff --git a/common/cryptoutil/inc/asmcrypto.h b/common/cryptoutil/inc/asmcrypto.h
index d753417..a4a0164 100755 (executable)
--- a/common/cryptoutil/inc/asmcrypto.h
+++ b/common/cryptoutil/inc/asmcrypto.h
@@ -54,8 +54,8 @@ public:
                                                                                  const unsigned char *private_key, int priv_key_len,
                                                                                  int *sig_len);
 
-       static unsigned char* fidoSign(const unsigned char *msg, int msg_len, const char *private_key_file,
-                                               const char *pwd, int *sig_len);
+       /*static unsigned char* fidoSign(const unsigned char *msg, int msg_len, const char *private_key_file,
+                                               const char *pwd, int *sig_len);*/
 
        static std::string getAsmToken(void);
 

diff --git a/common/cryptoutil/src/AsmCrypto.cpp b/common/cryptoutil/src/AsmCrypto.cpp
index 4c989f5..c89da83 100755 (executable)
--- a/common/cryptoutil/src/AsmCrypto.cpp
+++ b/common/cryptoutil/src/AsmCrypto.cpp
@@ -1161,7 +1161,7 @@ AsmCrypto::fidoSignWithKey(const unsigned char *msg, int msg_len,
        return sig;
 }
 
-unsigned char*
+/*unsigned char*
 AsmCrypto::fidoSign(const unsigned char *msg, int msg_len, const char *private_key_file,
                                        const char *pwd, int *sig_len)
 {
@@ -1222,7 +1222,7 @@ AsmCrypto::fidoSign(const unsigned char *msg, int msg_len, const char *private_k
 
        *sig_len = sig_len_loc;
        return sig;
-}
+}*/
 
 int
 AsmCrypto::genRandomInt(void)

diff --git a/fido-asm.manifest b/fido-asm.manifest
index ad0406a..71320db 100644 (file)
--- a/fido-asm.manifest
+++ b/fido-asm.manifest
@@ -4,6 +4,5 @@
        </request>
        <assign>
        <filesystem path="/opt/usr/data/fido_tizen_auth.der" label="_" />
-       <filesystem path="/opt/usr/data/fido_tizen_auth.key" label="_" />
     </assign>
 </manifest>

diff --git a/packaging/fido-asm.spec b/packaging/fido-asm.spec
index 19b2680..d5260f8 100755 (executable)
--- a/packaging/fido-asm.spec
+++ b/packaging/fido-asm.spec
@@ -242,11 +242,11 @@ FIDO Silent Authenticator
 
 %post -n fido_silent
 chown service_fw:service_fw /opt/usr/data/silent_auth/fido_tizen_auth.der
-chown service_fw:service_fw /opt/usr/data/silent_auth/fido_tizen_auth.key
+#chown service_fw:service_fw /opt/usr/data/silent_auth/fido_tizen_auth.key
 chmod 660 /opt/usr/data/silent_auth/fido_tizen_auth.der
-chmod 660 /opt/usr/data/silent_auth/fido_tizen_auth.key
+#chmod 660 /opt/usr/data/silent_auth/fido_tizen_auth.key
 chsmack -a '_' /opt/usr/data/silent_auth/fido_tizen_auth.der
-chsmack -a '_' /opt/usr/data/silent_auth/fido_tizen_auth.key
+#chsmack -a '_' /opt/usr/data/silent_auth/fido_tizen_auth.key
 
 %postun -n fido_silent
 rm -r /opt/usr/data/silent_auth/
@@ -254,7 +254,7 @@ rm -r /opt/usr/data/silent_auth/
 %files -n fido_silent
 %{_libdir}/fido/asm/auth/libfido_silent_*.so*
 /opt/usr/data/silent_auth/fido_tizen_auth.der
-/opt/usr/data/silent_auth/fido_tizen_auth.key
+#/opt/usr/data/silent_auth/fido_tizen_auth.key
 
 #################################################################################
 # FIDO BT Roaming Agent

diff --git a/silent_auth/CMakeLists.txt b/silent_auth/CMakeLists.txt
index 37e7a06..d632603 100644 (file)
--- a/silent_auth/CMakeLists.txt
+++ b/silent_auth/CMakeLists.txt
@@ -55,6 +55,6 @@ SET_TARGET_PROPERTIES(${SILENT_PACKAGE_NAME} PROPERTIES VERSION 1)
 TARGET_LINK_LIBRARIES(${SILENT_PACKAGE_NAME} ${SILENT_AUTH_PKGS_LDFLAGS})
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_tizen_auth.der DESTINATION /opt/usr/data/silent_auth/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_tizen_auth.key DESTINATION /opt/usr/data/silent_auth/)
+#INSTALL(FILES ${CMAKE_SOURCE_DIR}/fido_tizen_auth.key DESTINATION /opt/usr/data/silent_auth/)
 
 INSTALL(TARGETS ${SILENT_PACKAGE_NAME} DESTINATION ${LIBDIR}/fido/asm/auth)

diff --git a/silent_auth/silent_auth_entry.cpp b/silent_auth/silent_auth_entry.cpp
index 72172f4..e5d935f 100755 (executable)
--- a/silent_auth/silent_auth_entry.cpp
+++ b/silent_auth/silent_auth_entry.cpp
@@ -877,7 +877,7 @@ processRegister(unsigned char *assert_req)
 
        _INFO("Before SignWithPrivateKeyFile");
        int sig_len = 0;
-       unsigned char *sign_raw = AsmCrypto::fidoSign(krdStr, krdStr_len,
+       /*unsigned char *sign_raw = AsmCrypto::fidoSign(krdStr, krdStr_len,
                                                                                                FIDO_TIZEN_AUTH_KEY_PATH,
                                                                                                "tizen", &sig_len);
 
@@ -888,7 +888,7 @@ processRegister(unsigned char *assert_req)
                SAFE_DELETE(priv_key_b64_enc);
                SAFE_DELETE(keyId_b64_enc);
                return NULL;
-       }
+       }*/
 
        _INFO("After SignWithPrivateKeyFile, Length of signature is = [%d]", sig_len);
 
@@ -902,7 +902,7 @@ processRegister(unsigned char *assert_req)
 
        getRegRespInfo->regAssertion->attFull->sig = ALLOC(Buffer);
        getRegRespInfo->regAssertion->attFull->sig->data = NALLOC(sig_len, uint8_t);
-       memcpy(getRegRespInfo->regAssertion->attFull->sig->data, sign_raw, sig_len);
+       //memcpy(getRegRespInfo->regAssertion->attFull->sig->data, sign_raw, sig_len);
        getRegRespInfo->regAssertion->attFull->sig->len = sig_len;
 
        getRegRespInfo->regAssertion->attFull->cert = ALLOC(Buffer);