[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/cms/ cms_smime.c openssl/crypto/pkcs7/ p...
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2008-11-21 18:18:13
Message-ID: 20081121181813.BEB191EAE915 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   21-Nov-2008 19:18:13
  Branch: HEAD                             Handle: 2008112118181201

  Modified files:
    openssl/crypto/cms      cms_smime.c
    openssl/crypto/pkcs7    pk7_smime.c

  Log:
    Set memory BIOs up properly when stripping text headers from S/MIME
    messages.

  Summary:
    Revision    Changes     Path
    1.22        +3  -0      openssl/crypto/cms/cms_smime.c
    1.41        +1  -0      openssl/crypto/pkcs7/pk7_smime.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/cms/cms_smime.c
  ============================================================================
  $ cvs diff -u -r1.21 -r1.22 cms_smime.c
  --- openssl/crypto/cms/cms_smime.c	5 Aug 2008 15:55:53 -0000	1.21
  +++ openssl/crypto/cms/cms_smime.c	21 Nov 2008 18:18:12 -0000	1.22
  @@ -68,7 +68,10 @@
   	if (out == NULL)
   		tmpout = BIO_new(BIO_s_null());
   	else if (flags & CMS_TEXT)
  +		{
   		tmpout = BIO_new(BIO_s_mem());
  +		BIO_set_mem_eof_return(tmpout, 0);
  +		}
   	else
   		tmpout = out;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/crypto/pkcs7/pk7_smime.c
  ============================================================================
  $ cvs diff -u -r1.40 -r1.41 pk7_smime.c
  --- openssl/crypto/pkcs7/pk7_smime.c	5 Nov 2008 18:39:01 -0000	1.40
  +++ openssl/crypto/pkcs7/pk7_smime.c	21 Nov 2008 18:18:13 -0000	1.41
  @@ -380,6 +380,7 @@
   			PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_MALLOC_FAILURE);
   			goto err;
   		}
  +		BIO_set_mem_eof_return(tmpout, 0);
   	} else tmpout = out;
   
   	/* We now have to 'read' from p7bio to calculate digests etc. */
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]