[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-450-g8a6dcb2cff

[Jim Brandt]

The branch, 4.4-trunk has been updated
       via  8a6dcb2cffd5b979957570a86387f77faa4b44dd (commit)
       via  e9202dbcbff9f0a31098a4ea65d831e2aba3c1ea (commit)
       via  0e0e89fd95b77459d637875eaf96da590dc4801a (commit)
      from  14550358c995ca10dffdfbb883749cb169771245 (commit)

Summary of changes:
 lib/RT/Crypt/Role.pm          |   7 ++-
 lib/RT/Crypt/SMIME.pm         |  32 +++++++---
 t/mail/smime/separate_certs.t | 137 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 10 deletions(-)
 create mode 100644 t/mail/smime/separate_certs.t

- Log -----------------------------------------------------------------
commit 8a6dcb2cffd5b979957570a86387f77faa4b44dd
Merge: 14550358c9 e9202dbcbf
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu May 20 16:37:06 2021 -0400

    Merge branch '4.4/smime-separate-encrypt-and-sign-certs' into 4.4-trunk

diff --cc lib/RT/Crypt/SMIME.pm
index 546247696c,f891940b8b..bf921d0cc6
--- a/lib/RT/Crypt/SMIME.pm
+++ b/lib/RT/Crypt/SMIME.pm
@@@ -84,12 -79,12 +84,16 @@@ You should start from reading L<RT::Cry
          CAPath  => '/opt/rt4/var/data/smime/signing-ca.pem',
          Passphrase => {
              'queue.address at example.com' => 'passphrase',
+             'another.queue.address at example.com' => {
+                 Encryption => 'passphrase for encryption certificate',
+                 Signing    => 'passphrase for signing certificate',
+             },
              '' => 'fallback',
          },
 +        OtherCertificatesToSend => '/opt/rt4/var/data/smime/other-certs.pem',
 +        CheckCRL => 0,
 +        CheckOCSP => 0,
 +        CheckRevocationDownloadTimeout => 30,
      );
  
  =head3 OpenSSL
@@@ -394,10 -357,9 +403,10 @@@ sub _SignEncrypt 
              $res{exit_code} = 1;
              return (undef, %res);
          }
-         $args{'Passphrase'} = $self->GetPassphrase( Address => $args{'Signer'} )
+         $args{'Passphrase'} = $self->GetPassphrase( Address => $args{'Signer'}, For => 'Signing' )
              unless defined $args{'Passphrase'};
  
 +        $args{OtherCertificatesToSend} //= $opts->{OtherCertificatesToSend};
          push @commands, [
              $self->OpenSSLPath, qw(smime -sign),
              -signer => $file,

-----------------------------------------------------------------------