From 15db49a1457be6f234ee51406bdeafb60aa7095c Mon Sep 17 00:00:00 2001 From: daniel2311 Date: Mon, 25 Nov 2024 20:49:33 +0000 Subject: [PATCH] Problems with Crypt:CBC on newer CBC Versions See: https://forum.fhem.de/index.php/topic,80703.msg1264423.html#msg1264423 git-svn-id: https://svn.fhem.de/fhem/trunk@29361 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/38_Broadlink.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fhem/FHEM/38_Broadlink.pm b/fhem/FHEM/38_Broadlink.pm index faf11c095..3a91188b5 100644 --- a/fhem/FHEM/38_Broadlink.pm +++ b/fhem/FHEM/38_Broadlink.pm @@ -493,6 +493,7 @@ sub Broadlink_auth(@) { sub Broadlink_getCipher(@) { my ($hash) = @_; + my $version = $Crypt::CBC::VERSION // 2; return Crypt::CBC->new( -key => $hash->{'.key'}, -cipher => "Crypt::OpenSSL::AES", @@ -501,6 +502,16 @@ sub Broadlink_getCipher(@) { -literal_key => 1, -keysize => 16, -padding => 'space' + ) if ($version < 3); + + return Crypt::CBC->new( + -key => $hash->{'.key'}, + -cipher => "Crypt::OpenSSL::AES", + -header => "none", + -iv => $hash->{'.iv'}, + -literal_key => 1, + -keysize => 16, + -padding => 'none' ); }