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

Side by Side Diff

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

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

Side by Side Diff: openssl/crypto/evp/c_allc.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 unified diff | Download patch | Annotate | Revision Log

« openssl.gyp ('K') | « openssl/crypto/evp/c_all.c ('k') | openssl/crypto/evp/c_alld.c » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')

OLD	NEW
1 /* crypto/evp/c_allc.c */	1 /* crypto/evp/c_allc.c */

2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)	2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

3 * All rights reserved.	3 * All rights reserved.

4 *	4 *

5 * This package is an SSL implementation written	5 * This package is an SSL implementation written

6 * by Eric Young (eay@cryptsoft.com).	6 * by Eric Young (eay@cryptsoft.com).

7 * The implementation was written so as to conform with Netscapes SSL.	7 * The implementation was written so as to conform with Netscapes SSL.

8 *	8 *

9 * This library is free for commercial and non-commercial use as long as	9 * This library is free for commercial and non-commercial use as long as

10 * the following conditions are aheared to. The following conditions	10 * the following conditions are aheared to. The following conditions

(...skipping 203 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
214 EVP_add_cipher_alias(SN_camellia_192_cbc,"camellia192");	214 EVP_add_cipher_alias(SN_camellia_192_cbc,"camellia192");

215 EVP_add_cipher(EVP_camellia_256_ecb());	215 EVP_add_cipher(EVP_camellia_256_ecb());

216 EVP_add_cipher(EVP_camellia_256_cbc());	216 EVP_add_cipher(EVP_camellia_256_cbc());

217 EVP_add_cipher(EVP_camellia_256_cfb());	217 EVP_add_cipher(EVP_camellia_256_cfb());

218 EVP_add_cipher(EVP_camellia_256_cfb1());	218 EVP_add_cipher(EVP_camellia_256_cfb1());

219 EVP_add_cipher(EVP_camellia_256_cfb8());	219 EVP_add_cipher(EVP_camellia_256_cfb8());

220 EVP_add_cipher(EVP_camellia_256_ofb());	220 EVP_add_cipher(EVP_camellia_256_ofb());

221 EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");	221 EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");

222 EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");	222 EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");

223 #endif	223 #endif

224

225 PKCS12_PBE_add();

226 PKCS5_PBE_add();

227 }	224 }

OLD	NEW