[checkmk-commits] #3075 FIX windows agent: fixed data encryption of realtime updates were incompatible

Module: check_mk Branch: master Commit: 1ebd0270923d06e923d59398d94e57c7fc3b51cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ebd0270923d06… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 15 15:29:05 2016 +0100 #3075 FIX windows agent: fixed data encryption of realtime updates were incompatible The windows agent used sha-1 hashes to derive the key/iv-pair from the pass phrase while check_mk and the linux agent use md5 --- .werks/3075 | 11 +++++++++++ ChangeLog | 1 + agents/windows/Crypto.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3075 b/.werks/3075 new file mode 100644 index 0000000..fcc0db9 --- /dev/null +++ b/.werks/3075 @@ -0,0 +1,11 @@ +Title: windows agent: fixed data encryption of realtime updates were incompatible +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455546420 + +The windows agent used sha-1 hashes to derive the key/iv-pair from the pass phrase while check_mk +and the linux agent use md5 diff --git a/ChangeLog b/ChangeLog index b3243d5..39197c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters + * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/agents/windows/Crypto.h b/agents/windows/Crypto.h index c202b74..6400fd8 100644 --- a/agents/windows/Crypto.h +++ b/agents/windows/Crypto.h @@ -14,7 +14,7 @@ private: // algorithm can't currently be changed static const ALG_ID DEFAULT_ALGORITHM = CALG_AES_256; - static const ALG_ID HASH_ALGORITHM = CALG_SHA1; + static const ALG_ID HASH_ALGORITHM = CALG_MD5; enum KeyLength { KEY_LEN_DEFAULT = 0,