X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4988a192dab00d86203bd44995b53284abfa1474..a8cd445ea971cdc6e2ebbedb6e0786d2c24aa972:/debian/extra/rc/smime-paths.rc

diff --git a/debian/extra/rc/smime-paths.rc b/debian/extra/rc/smime-paths.rc
index 6dd9878..ace80b8 100644
--- a/debian/extra/rc/smime-paths.rc
+++ b/debian/extra/rc/smime-paths.rc
@@ -1,6 +1,5 @@
-
 # S/MIME configuration
-set smime_ca_location="~/.smime/ca-bundle.crt"
+set smime_ca_location=`for f in $HOME/.smime/ca-certificates.crt $HOME/.smime/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt ; do if [ -f $f ] ; then echo $f ; exit ; fi ; done`
 set smime_certificates="~/.smime/certificates"
 set smime_keys="~/.smime/keys"
 set smime_pk7out_command="openssl smime -verify -in %f -noverify -pk7out"
@@ -12,9 +11,10 @@ set smime_encrypt_command="openssl smime -encrypt %a -outform DER -in %f %c"
 set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -certfile %i -outform DER"
 # This alternative command does not include the full certificates chain.
 # Be sure to understand RFC 2315 section 9.1 before using it.
-# set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER"
+#set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER"
 set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c"
 set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f"
-set smime_verify_opaque_command="openssl smime -verify -inform DER -in %s %C"
+set smime_verify_opaque_command="\
+openssl smime -verify -inform DER -in %s %C || \
+openssl smime -verify -inform DER -in %s -noverify 2>/dev/null"
 
-set mixmaster="mixmaster-filter"