openssl/crypto/asn1/d2i_pu.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/asn1/d2i_pu.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/asn1/d2i_pu.c

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

--- openssl/crypto/asn1/d2i_pu.c (revision 105093)

+++ openssl/crypto/asn1/d2i_pu.c (working copy)

@@ -87,10 +87,14 @@

}

else ret= *a;

- ret->save_type=type;

- ret->type=EVP_PKEY_type(type);

- switch (ret->type)

+ if (!EVP_PKEY_set_type(ret, type))

{

+ ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_EVP_LIB);

+ goto err;

+ }

+ switch (EVP_PKEY_id(ret))

+ {

#ifndef OPENSSL_NO_RSA

case EVP_PKEY_RSA:

if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,

« no previous file with comments | « openssl/crypto/asn1/d2i_pr.c ('k') | openssl/crypto/asn1/i2d_pr.c » ('j') | no next file with comments »