FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 04:36:36 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: cryptografic function modified (rolling code check)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19962 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2019-08-07 18:47:53 +00:00
parent 87449f7dbb
commit 7a4f080de6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_EnOcean.pm
View File

@ -12262,7 +12262,7 @@ sub EnOcean_Parse($$)
$attr{$name}{productID} = EnOcean_convBitToHex($1);
$data = $2;
} elsif ($signalType == 3) {
######
#####
# Connected GSI Sensor IDs
my $gsiIdDataLen = $teachInDataLen - 16;
$data =~ m/^(.{8})(.{8})(.{$gsiIdDataLen})(.*)$/;
@ -17207,9 +17207,11 @@ sub EnOcean_sec_convertToNonsecure($$$) {
$rlc = $2;
$mac = $3;
} elsif ($expect_rlc == 0 && $expect_mac == 1) {
$rlc = ReadingsVal($name, ".rlcRcv", $attr{$name}{rlcRcv});
$rlc = $attr{$name}{rlcRcv} if (hex($rlc) < hex($attr{$name}{rlcRcv}));
$mac = $2;
}
my $old_rlc = $rlc;
Log3 $name, 5, "EnOcean $name EnOcean_sec_convertToNonsecure RORG: $rorg DATA_ENC: $data_enc";
if ($expect_rlc == 1) {
Log3 $name, 5, "EnOcean $name EnOcean_sec_convertToNonsecure RLC: $rlc";
@ -17263,6 +17265,9 @@ sub EnOcean_sec_convertToNonsecure($$$) {
}
# Couldn't verify or decrypt message in RLC window
#####
# restore old rlc
readingsSingleUpdate($hash, ".rlcRcv", $old_rlc, 0);
$attr{$name}{rlcRcv} = $old_rlc;
return ("Can't verify or decrypt telegram", undef, undef);
}