openssl/crypto/cms/cms_smime.c - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: openssl/crypto/cms/cms_smime.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/

Patch Set: '' Created 8 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: openssl/crypto/cms/cms_smime.c

===================================================================

--- openssl/crypto/cms/cms_smime.c (revision 105093)

+++ openssl/crypto/cms/cms_smime.c (working copy)

@@ -171,7 +171,7 @@

if (!cms)

return NULL;

- if (CMS_final(cms, in, NULL, flags))

+ if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))

return cms;

CMS_ContentInfo_free(cms);

@@ -214,10 +214,7 @@

return NULL;

if(!(flags & CMS_DETACHED))

- {

- flags &= ~CMS_STREAM;

CMS_set_detached(cms, 0);

- }

if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))

return cms;

@@ -269,10 +266,7 @@

return NULL;

if(!(flags & CMS_DETACHED))

- {

- flags &= ~CMS_STREAM;

CMS_set_detached(cms, 0);

- }

if ((flags & (CMS_STREAM|CMS_PARTIAL))

|| CMS_final(cms, in, NULL, flags))

@@ -456,6 +450,7 @@

X509_STORE *store, unsigned int flags)

{

int r;

+ flags &= ~(CMS_DETACHED|CMS_TEXT);

r = CMS_verify(rcms, certs, store, NULL, NULL, flags);

if (r <= 0)

return r;

@@ -486,10 +481,7 @@

}

if(!(flags & CMS_DETACHED))

- {

- flags &= ~CMS_STREAM;

CMS_set_detached(cms, 0);

- }

if ((flags & (CMS_STREAM|CMS_PARTIAL))

|| CMS_final(cms, data, NULL, flags))

@@ -517,7 +509,7 @@

BIO *rct_cont = NULL;

int r = 0;

- flags &= ~CMS_STREAM;

+ flags &= ~(CMS_STREAM|CMS_TEXT);

/* Not really detached but avoids content being allocated */

flags |= CMS_PARTIAL|CMS_BINARY|CMS_DETACHED;

if (!pkey || !signcert)

@@ -598,10 +590,7 @@

}

if(!(flags & CMS_DETACHED))

- {

- flags &= ~CMS_STREAM;

CMS_set_detached(cms, 0);

- }

if ((flags & (CMS_STREAM|CMS_PARTIAL))

|| CMS_final(cms, data, NULL, flags))

@@ -781,12 +770,9 @@

return NULL;

if(!(flags & CMS_DETACHED))

- {

- flags &= ~CMS_STREAM;

CMS_set_detached(cms, 0);

- }

- if (CMS_final(cms, in, NULL, flags))

+ if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))

return cms;

CMS_ContentInfo_free(cms);

« no previous file with comments | « openssl/crypto/cms/cms_sd.c ('k') | openssl/crypto/comp/Makefile » ('j') | no next file with comments »