openssl/ssl/ssl_algs.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/ssl/ssl_algs.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/ssl/ssl_algs.c

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

--- openssl/ssl/ssl_algs.c (revision 105093)

+++ openssl/ssl/ssl_algs.c (working copy)

@@ -76,13 +76,16 @@

#endif

#ifndef OPENSSL_NO_RC2

EVP_add_cipher(EVP_rc2_cbc());

+ /* Not actually used for SSL/TLS but this makes PKCS#12 work

+ * if an application only calls SSL_library_init().

+ */

+ EVP_add_cipher(EVP_rc2_40_cbc());

#endif

#ifndef OPENSSL_NO_AES

EVP_add_cipher(EVP_aes_128_cbc());

EVP_add_cipher(EVP_aes_192_cbc());

EVP_add_cipher(EVP_aes_256_cbc());

#endif

#ifndef OPENSSL_NO_CAMELLIA

EVP_add_cipher(EVP_camellia_128_cbc());

EVP_add_cipher(EVP_camellia_256_cbc());

@@ -91,7 +94,7 @@

#ifndef OPENSSL_NO_SEED

EVP_add_cipher(EVP_seed_cbc());

#endif

#ifndef OPENSSL_NO_MD5

EVP_add_digest(EVP_md5());

EVP_add_digest_alias(SN_md5,"ssl2-md5");

« no previous file with comments | « openssl/ssl/ssl3.h ('k') | openssl/ssl/ssl_asn1.c » ('j') | no next file with comments »