[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.13-67-ga0f3880

[Shawn Moore]

The branch, 4.2-trunk has been updated
       via  a0f38800f21edbaed3e6a5e29a6a0ecaa6978c37 (commit)
       via  43aa03582cddc23aee38a52a4aeacf042766176e (commit)
      from  c9774928c6da3757b266e305a2794f0b4122ac47 (commit)

Summary of changes:
 lib/RT/Crypt/SMIME.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

- Log -----------------------------------------------------------------
commit 43aa03582cddc23aee38a52a4aeacf042766176e
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Nov 27 00:54:37 2016 +0000

    Adapt SMIME probe to work with openssl 1.1
    
    OpenSSL 1.1 dropped the list-standard-commands command, so also try
    'openssl list -commands'.

diff --git a/lib/RT/Crypt/SMIME.pm b/lib/RT/Crypt/SMIME.pm
index 743ab2b..ab75246 100644
--- a/lib/RT/Crypt/SMIME.pm
+++ b/lib/RT/Crypt/SMIME.pm
@@ -184,6 +184,14 @@ sub Probe {
             \$buf, \$err
         ) };
 
+        if ($err && $err =~ /Invalid command/) {
+            ($buf, $err) = ('', '');
+            safe_run_child { run3( [$bin, "list", "-commands"],
+                \undef,
+                \$buf, \$err
+            ) };
+        }
+
         if ($? or $err) {
             $RT::Logger->warning(
                 "RT's SMIME libraries couldn't successfully execute openssl.".

commit a0f38800f21edbaed3e6a5e29a6a0ecaa6978c37
Merge: c977492 43aa035
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Nov 28 12:25:45 2016 -0500

    Merge branch 'openssl_1.1' into 4.2-trunk


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