Changeset 5145:0e32bd00f341

Timestamp:

2007-04-29 19:10:20 (21 months ago)

Author:

Alain Bench <veronatif@…>

Branch:

HEAD

Message:

contrib/smime.rc: $smime_verify_opaque_command fallback to -noverify
to get signed text despite a failed -verify (but send only this first
failure notice to stderr).
smime.c: fflush() before rewind().
Closes #2428. Helps Debian Bug 420014

Files:

• contrib/smime.rc (modified) (1 diff)
• smime.c (modified) (5 diffs)

contrib/smime.rc

@@ -80 +80 @@
 
 # Verify a signature of type application/x-pkcs7-mime
-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"
 
 

smime.c

@@ -860 +860 @@
   fflush (fpout);
   rewind (fpout);
+  fflush (fperr);
   rewind (fperr);
-  fflush (fperr);
 
 
@@ -955 +955 @@
   fflush (fpout);
   rewind (fpout);
+  fflush (fperr);
   rewind (fperr);
-  fflush (fperr);
   empty = (fgetc (fpout) == EOF);
   if (empty)
@@ -1001 +1001 @@
   fflush (fpout);
   rewind (fpout);
+  fflush (fperr);
   rewind (fperr);
-  fflush (fperr);
   empty =  (fgetc (fpout) == EOF);
   if (empty)
@@ -1064 +1064 @@
   fflush (fpout);
   rewind (fpout);
+  fflush (fperr);
   rewind (fperr);
-  fflush (fperr);
   empty =  (fgetc (fpout) == EOF);
   if (empty)
@@ -1751 +1751 @@
   if (s->flags & M_DISPLAY)
   {
+    fflush (smimeerr);
     rewind (smimeerr);