Merge from sarge branch.

[software/mutt-debian.git] / debian / extra / rc / smime-paths.rc

diff --git a/debian/extra/rc/smime-paths.rc b/debian/extra/rc/smime-paths.rc
index 36ebd447a5cb6eb21c4860ded6c1b17b09ccc77a..ace80b8ca48299e33d555093c399e72dbb6dc050 100644 (file)
--- a/debian/extra/rc/smime-paths.rc
+++ b/debian/extra/rc/smime-paths.rc
@@ -14,5 +14,7 @@ set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -
 #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_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"