__DANGEROUS__LOG_CONFIDENTIAL_DATA is now 0/1 #defined

This commit is contained in:
2017-02-02 13:57:44 +01:00
parent 5b79f5d849
commit 058ec398e6
4 changed files with 24 additions and 14 deletions

View File

@@ -28,12 +28,25 @@
/// @{
#ifndef EAP_ENCRYPT_BLOBS
///
/// BLOBs leaving our module are encrypted
/// Encrypt BLOBs leaving our module
///
#define EAP_ENCRYPT_BLOBS 1
#endif
/// @}
///
/// \defgroup EAPBaseModule Modules
/// Modules
///
/// @{
#ifndef __DANGEROUS__LOG_CONFIDENTIAL_DATA
///
/// Output passwords and other confidential information to event log
///
#define __DANGEROUS__LOG_CONFIDENTIAL_DATA 0
#endif
/// @}
///
/// \defgroup EAPBaseCred Credentials
/// Credential management
@@ -41,7 +54,7 @@
/// @{
#ifndef EAP_USE_NATIVE_CREDENTIAL_CACHE
///
/// Using EapHost credential cache
/// Use EapHost credential cache
///
#define EAP_USE_NATIVE_CREDENTIAL_CACHE 0
#endif

View File

@@ -47,10 +47,7 @@ extern "C" {
namespace eap
{
///
/// \defgroup EAPBaseModule Modules
/// Modules
///
/// \addtogroup EAPBaseModule
/// @{
///
@@ -236,8 +233,8 @@ namespace eap
///
inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const
{
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.")
#if __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider setting __DANGEROUS__LOG_CONFIDENTIAL_DATA to 0.")
log_config(name, value);
#else
log_config(name, value ? value[0] ? L"********" : L"" : NULL);
@@ -255,8 +252,8 @@ namespace eap
///
inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const
{
#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.")
#if __DANGEROUS__LOG_CONFIDENTIAL_DATA
#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!! Passwords and certificates will be logged as a clear-text. Please, consider setting __DANGEROUS__LOG_CONFIDENTIAL_DATA to 0.")
log_config(name, data, size);
#else
log_config(name, data ? size ? L"********" : L"" : NULL);