OpenSSL: OpenSSL_0_9_7-stable: openssl/apps/ smime.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
13-Jul-2006 22:36:52
  Branch: OpenSSL_0_9_7-stable             Handle:
2006071321365100

  Modified files:           (Branch: OpenSSL_0_9_7-stable)
    openssl/apps            smime.c

  Log:
    Fix from HEAD. Except we can't stream multipart/signed
in 0.9.7 so that case
    still rewinds the stream.

  Summary:
    Revision    Changes     Path
    1.38.2.12   +2  -1      openssl/apps/smime.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/apps/smime.c
 
============================================================
================
  $ cvs diff -u -r1.38.2.11 -r1.38.2.12 smime.c
  --- openssl/apps/smime.c	1 Jun 2003 20:45:43
-0000	1.38.2.11
  +++ openssl/apps/smime.c	13 Jul 2006 20:36:51
-0000	1.38.2.12
   -483,7 +483,8 
   		p7 = PKCS7_encrypt(encerts, in, cipher, flags);
   	} else if(operation == SMIME_SIGN) {
   		p7 = PKCS7_sign(signer, key, other, in, flags);
  -		if (BIO_reset(in) != 0 && (flags &
PKCS7_DETACHED)) {
  +		if ((flags & PKCS7_DETACHED) && (outformat
== FORMAT_SMIME)
  +			&& (BIO_reset(in) != 0)) {
   		  BIO_printf(bio_err, "Can't rewind input
file\n");
   		  goto end;
   		}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org