OpenSSL: OpenSSL_0_9_8-stable: openssl/crypto/pkcs7/ pk7_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:  
09-Jul-2006 14:03:03
  Branch: OpenSSL_0_9_8-stable             Handle:
2006070913030200

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/crypto/pkcs7    pk7_smime.c

  Log:
    Fix from HEAD.

  Summary:
    Revision    Changes     Path
    1.24.2.3    +2  -1      openssl/crypto/pkcs7/pk7_smime.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/pkcs7/pk7_smime.c
 
============================================================
================
  $ cvs diff -u -r1.24.2.2 -r1.24.2.3 pk7_smime.c
  --- openssl/crypto/pkcs7/pk7_smime.c	4 Aug 2005 22:10:05
-0000	1.24.2.2
  +++ openssl/crypto/pkcs7/pk7_smime.c	9 Jul 2006 12:03:02
-0000	1.24.2.3
   -130,6 +130,8 
   	if (flags & PKCS7_STREAM)
   		return p7;
   
  +	if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);
  +
   	if (!(p7bio = PKCS7_dataInit(p7, NULL))) {
   		PKCS7err(PKCS7_F_PKCS7_SIGN,ERR_R_MALLOC_FAILURE);
   		PKCS7_free(p7);
   -138,7 +140,6 
   
   	SMIME_crlf_copy(data, p7bio, flags);
   
  -	if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);
   
           if (!PKCS7_dataFinal(p7,p7bio)) {
   		PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_DATASIGN);
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org