This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=4f909455d054eca03e8f09da34ae6b7c2aa5e8a4 commit 4f909455d054eca03e8f09da34ae6b7c2aa5e8a4 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Mon Dec 16 04:09:18 2024 +0100 Dpkg::OpenPGP::Backend::SOP: Use the parent class armor/dearmor implementations We cannot use the SOP armor/dearmor interfaces, because concatenated ASCII Armor is not a well supported construct, which not all SOP implementations support. But we still need to handle this given the data we are managing. Remove these implementations for now and use the generic parent implementations. Once we can guarantee that our data has been sanitized, then we could switch back to use pure SOP interfaces. --- scripts/Dpkg/OpenPGP/Backend/SOP.pm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/scripts/Dpkg/OpenPGP/Backend/SOP.pm b/scripts/Dpkg/OpenPGP/Backend/SOP.pm index e84b663ef..b75f082db 100644 --- a/scripts/Dpkg/OpenPGP/Backend/SOP.pm +++ b/scripts/Dpkg/OpenPGP/Backend/SOP.pm @@ -76,21 +76,13 @@ sub _sop_exec } } -sub armor -{ - my ($self, $type, $in, $out) = @_; - - # We ignore the $type, and let "sop" handle this automatically. - return $self->_sop_exec({ in => $in, out => $out }, 'armor'); -} - -sub dearmor -{ - my ($self, $type, $in, $out) = @_; - - # We ignore the $type, and let "sop" handle this automatically. - return $self->_sop_exec({ in => $in, out => $out }, 'dearmor'); -} +# XXX: We cannot use the SOP armor/dearmor interfaces, because concatenated +# ASCII Armor is not a well supported construct, and not all SOP +# implementations support. But we still need to handle this given the +# data we are managing. Remove these implementations for now and use +# the generic parent implementations. Once we can guarantee that our +# data has been sanitized, then we could switch back to use pure SOP +# interfaces. sub inline_verify { -- Dpkg.Org's dpkg
