diff options
| author | Andriy Byzhynar <AByzhynar@luxoft.com> | 2018-02-14 16:39:22 +0200 |
|---|---|---|
| committer | Andrii Kalinich <AKalinich@luxoft.com> | 2018-06-18 18:50:54 +0300 |
| commit | 6669b25d21d326fd0b6a0e470b80374e1da2d0b6 (patch) | |
| tree | 46079992fc7dda192ab155aa71882d98cfe0bd11 /src/components/protocol_handler/src/protocol_handler_impl.cc | |
| parent | a0a2951999d10dcf3c27e1a5a854cf6a28167021 (diff) | |
| download | sdl_core-6669b25d21d326fd0b6a0e470b80374e1da2d0b6.tar.gz | |
Add handling of wrong force protection settings in ini file
Diffstat (limited to 'src/components/protocol_handler/src/protocol_handler_impl.cc')
| -rw-r--r-- | src/components/protocol_handler/src/protocol_handler_impl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index e5bacdbf6f..9db6355d50 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -1426,10 +1426,16 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession( #ifdef ENABLE_SECURITY const bool protection = +<<<<<<< HEAD // Protocol version 1 is not support protection (packet->protocol_version() > PROTOCOL_VERSION_1) ? packet->protection_flag() : false; +======= + // Protocol version 1 does not support protection + (protocol_version > PROTOCOL_VERSION_1) ? packet->protection_flag() + : false; +>>>>>>> Add handling of wrong force protection settings in ini file #else const bool protection = false; #endif // ENABLE_SECURITY |