MESSAGE("SECURITY_MDFPP_STATE_ENABLE DISABLED !")
ENDIF (DEFINED SECURITY_MDFPP_STATE_ENABLE)
+IF (DEFINED OPTIONAL_PASSWORD_ENABLE)
+ MESSAGE("OPTIONAL_PASSWORD_ENABLE ON")
+ ADD_DEFINITIONS("-DOPTIONAL_PASSWORD_ENABLE")
+ELSE (DEFINED OPTIONAL_PASSWORD_ENABLE)
+ MESSAGE("OPTIONAL_PASSWORD_ENABLE OFF")
+ENDIF (DEFINED OPTIONAL_PASSWORD_ENABLE)
+
IF (DEFINED SYSTEMD_ENV_FILE)
ADD_DEFINITIONS(-DSYSTEMD_ENV_FILE="${SYSTEMD_ENV_FILE}")
ENDIF (DEFINED SYSTEMD_ENV_FILE)
cp -a %{SOURCE1003} .
cp -a %{SOURCE1004} .
+# optional password disabled temporary for milestone release
+%define ckm_optional_password_enable 0
+
%build
%if 0%{?sec_build_binary_debug_enable}
export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
%if "%{sec_product_feature_security_mdfpp_enable}" == "1"
-DSECURITY_MDFPP_STATE_ENABLE=1 \
%endif
+%if 0%{?ckm_optional_password_enable}
+ -DOPTIONAL_PASSWORD_ENABLE=1 \
+%endif
-DSYSTEMD_UNIT_DIR=%{_unitdir} \
-DSYSTEMD_ENV_FILE="/etc/sysconfig/central-key-manager" \
-DMOCKUP_SM=%{?mockup_sm:%mockup_sm}%{!?mockup_sm:OFF}
crow.tag = dataPair.second;
+#ifdef OPTIONAL_PASSWORD_ENABLE
if (!password.empty()) {
key = passwordToKey(password, crow.iv, AES_CBC_KEY_SIZE);
crow.data = Crypto::SW::Internals::encryptDataAes(AlgoType::AES_CBC, key, crow.data, crow.iv);
crow.encryptionScheme |= ENCR_PASSWORD;
}
+#else
+ (void)password;
+#endif
encBase64(crow.data);
crow.encryptionScheme |= ENCR_BASE64;
decBase64(crow.data);
}
+#ifdef OPTIONAL_PASSWORD_ENABLE
if (crow.encryptionScheme & ENCR_PASSWORD) {
key = passwordToKey(password, crow.iv, AES_CBC_KEY_SIZE);
crow.data = Crypto::SW::Internals::decryptDataAes(AlgoType::AES_CBC, key, crow.data, crow.iv);
}
+#endif
if (crow.encryptionScheme & ENCR_APPKEY) {
key = m_keyMap[crow.ownerLabel];