Add some log and change log level in sig validator

Change-Id: I862d200c82b84e6a0af400d81d4c5004f951853e
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0a2029..44d7cbc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ SET(CMAKE_EXE_LINKER_FLAGS    "-Wl,--as-needed")
 SET(CMAKE_SKIP_RPATH          "TRUE")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
 ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
 ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")

diff --git a/vcore/dpl/log/include/dpl/log/log.h b/vcore/dpl/log/include/dpl/log/log.h
index 33ab7d5..cc4c8b5 100644 (file)
--- a/vcore/dpl/log/include/dpl/log/log.h
+++ b/vcore/dpl/log/include/dpl/log/log.h
@@ -145,18 +145,17 @@ do
     }                                                                           \
 } while (0)
 
-#define  LogError(message) DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Error)
 
 #ifdef BUILD_TYPE_DEBUG
     #define LogDebug(message)    DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Debug)
-    #define LogInfo(message)     DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Info)
-    #define LogWarning(message)  DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Warning)
     #define LogPedantic(message) DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Pedantic)
 #else
     #define LogDebug(message)    DPL_MACRO_DUMMY_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Debug)
-    #define LogInfo(message)     DPL_MACRO_DUMMY_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Info)
-    #define LogWarning(message)  DPL_MACRO_DUMMY_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Warning)
     #define LogPedantic(message) DPL_MACRO_DUMMY_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Pedantic)
 #endif // BUILD_TYPE_DEBUG
 
+#define LogInfo(message)    DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Info)
+#define LogWarning(message) DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Warning)
+#define LogError(message)   DPL_MACRO_FOR_LOGGING(message, VcoreDPL::Log::AbstractLogProvider::LogLevel::Error)
+
 #endif // DPL_LOG_H

diff --git a/vcore/vcore/SignatureValidator.cpp b/vcore/vcore/SignatureValidator.cpp
index 1db2eb1..eb769cd 100644 (file)
--- a/vcore/vcore/SignatureValidator.cpp
+++ b/vcore/vcore/SignatureValidator.cpp
@@ -355,8 +355,12 @@ SignatureValidator::Result SignatureValidator::check(
                        }
                }
 
-               if (checkOcsp && Ocsp::check(outData) == Ocsp::Result::REVOKED)
+               if (checkOcsp && Ocsp::check(outData) == Ocsp::Result::REVOKED) {
+                       LogError("Certificate is Revoked by OCSP server.");
                        return SIGNATURE_REVOKED;
+               }
+
+               LogDebug("Signature validation check done successfully ");
 
        } catch (const CertificateCollection::Exception::Base &e) {
                LogError("CertificateCollection exception : " << e.DumpToString());
@@ -365,7 +369,7 @@ SignatureValidator::Result SignatureValidator::check(
                LogError("XmlSec exception : " << e.DumpToString());
                return SIGNATURE_INVALID;
        } catch (const Ocsp::Exception::Base &e) {
-               LogError("Ocsp exception : " << e.DumpToString());
+               LogInfo("OCSP will be handled by cert-checker later. : " << e.DumpToString());
                /*
                 *  Don't care ocsp exception here.
                 *  just return signature disregard or verified
@@ -427,8 +431,12 @@ SignatureValidator::Result SignatureValidator::checkList(
                        }
                }
 
-               if (checkOcsp && Ocsp::check(outData) == Ocsp::Result::REVOKED)
+               if (checkOcsp && Ocsp::check(outData) == Ocsp::Result::REVOKED) {
+                       LogError("Certificate is Revoked by OCSP server.");
                        return SIGNATURE_REVOKED;
+               }
+
+               LogDebug("Signature validation of check list done successfully ");
 
        } catch (const CertificateCollection::Exception::Base &e) {
                LogError("CertificateCollection exception : " << e.DumpToString());
@@ -437,7 +445,7 @@ SignatureValidator::Result SignatureValidator::checkList(
                LogError("XmlSec exception : " << e.DumpToString());
                return SIGNATURE_INVALID;
        } catch (const Ocsp::Exception::Base &e) {
-               LogError("Ocsp exception : " << e.DumpToString());
+               LogInfo("OCSP will be handled by cert-checker later. : " << e.DumpToString());
                /*
                 *  Don't care ocsp exception here.
                 *  just return signature disregard or verified