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

WMBus: fix decryption for AES CBC mode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16996 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
kaihs 2018-07-17 14:58:33 +00:00
parent 3aca13ebcd
commit da1e1b7efc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- bugfix: 36_WMBUS: fix decryption for AES CBC mode
- feature: 42_AptToDate: add dist-upgrade available with Attribut
- change: 74_XiaomiBTLESens: more debug messages, delete old batteryreadings
- change: 83_IOhomecontrol, 84_IOhomecontrolDevice: complete rewrite and

14
fhem/FHEM/WMBus.pm
View File

@ -1448,7 +1448,7 @@ sub decrypt($) {
for (1..8) {
$initVector .= pack('C',$self->{access_no});
}
my $cipher = Crypt::Mode::CBC->new('AES', 1);
my $cipher = Crypt::Mode::CBC->new('AES', 2);
return $cipher->decrypt($encrypted, $self->{aeskey}, $initVector);
}
@ -1461,7 +1461,7 @@ sub decrypt_mode7($) {
for (1..16) {
$initVector .= pack('C',0x00);
}
my $cipher = Crypt::Mode::CBC->new('AES', 1);
my $cipher = Crypt::Mode::CBC->new('AES', 2);
return $cipher->decrypt($encrypted, $self->{aeskey}, $initVector);
}
@ -1817,9 +1817,9 @@ sub decodeApplicationLayer($) {
if ($self->{aeskey}) {
if ($hasCBC) {
$payload = $self->decrypt(substr($applicationlayer,$offset));
#printf("decrypted payload %s\n", unpack("H*", $payload));
if (unpack('n', $payload) == 0x2f2f) {
$self->{decrypted} = 1;
#printf("decrypted payload %s\n", unpack("H*", $payload));
} else {
# Decryption verification failed
$self->{errormsg} = 'Decryption failed, wrong key?';
@ -1961,7 +1961,13 @@ sub parse($$)
$self->{errormsg} = '';
$self->{errorcode} = ERR_NO_ERROR;
if (substr($self->{msg}, 0, 4) == pack("H*", "543D543D")) {
if (length($self->{msg}) < 12) {
$self->{errormsg} = "Message too short";
$self->{errorcode} = ERR_MSG_TOO_SHORT;
return 1;
}
if (substr($self->{msg}, 0, 4) eq pack("H*", "543D543D")) {
$self->setFrameType(FRAME_TYPE_B);
$self->{msg} = substr($self->{msg},4);
}