Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(939)

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/ssl/ssl3.h ('k') | openssl/ssl/ssl_asn1.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ssl/ssl_algs.c */ 1 /* ssl/ssl_algs.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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 EVP_add_cipher(EVP_des_ede3_cbc()); 69 EVP_add_cipher(EVP_des_ede3_cbc());
70 #endif 70 #endif
71 #ifndef OPENSSL_NO_IDEA 71 #ifndef OPENSSL_NO_IDEA
72 EVP_add_cipher(EVP_idea_cbc()); 72 EVP_add_cipher(EVP_idea_cbc());
73 #endif 73 #endif
74 #ifndef OPENSSL_NO_RC4 74 #ifndef OPENSSL_NO_RC4
75 EVP_add_cipher(EVP_rc4()); 75 EVP_add_cipher(EVP_rc4());
76 #endif 76 #endif
77 #ifndef OPENSSL_NO_RC2 77 #ifndef OPENSSL_NO_RC2
78 EVP_add_cipher(EVP_rc2_cbc()); 78 EVP_add_cipher(EVP_rc2_cbc());
79 /* Not actually used for SSL/TLS but this makes PKCS#12 work
80 * if an application only calls SSL_library_init().
81 */
82 EVP_add_cipher(EVP_rc2_40_cbc());
79 #endif 83 #endif
80 #ifndef OPENSSL_NO_AES 84 #ifndef OPENSSL_NO_AES
81 EVP_add_cipher(EVP_aes_128_cbc()); 85 EVP_add_cipher(EVP_aes_128_cbc());
82 EVP_add_cipher(EVP_aes_192_cbc()); 86 EVP_add_cipher(EVP_aes_192_cbc());
83 EVP_add_cipher(EVP_aes_256_cbc()); 87 EVP_add_cipher(EVP_aes_256_cbc());
84 #endif 88 #endif
85
86 #ifndef OPENSSL_NO_CAMELLIA 89 #ifndef OPENSSL_NO_CAMELLIA
87 EVP_add_cipher(EVP_camellia_128_cbc()); 90 EVP_add_cipher(EVP_camellia_128_cbc());
88 EVP_add_cipher(EVP_camellia_256_cbc()); 91 EVP_add_cipher(EVP_camellia_256_cbc());
89 #endif 92 #endif
90 93
91 #ifndef OPENSSL_NO_SEED 94 #ifndef OPENSSL_NO_SEED
92 EVP_add_cipher(EVP_seed_cbc()); 95 EVP_add_cipher(EVP_seed_cbc());
93 #endif 96 #endif
94 97
95 #ifndef OPENSSL_NO_MD5 98 #ifndef OPENSSL_NO_MD5
96 EVP_add_digest(EVP_md5()); 99 EVP_add_digest(EVP_md5());
97 EVP_add_digest_alias(SN_md5,"ssl2-md5"); 100 EVP_add_digest_alias(SN_md5,"ssl2-md5");
98 EVP_add_digest_alias(SN_md5,"ssl3-md5"); 101 EVP_add_digest_alias(SN_md5,"ssl3-md5");
99 #endif 102 #endif
100 #ifndef OPENSSL_NO_SHA 103 #ifndef OPENSSL_NO_SHA
101 EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ 104 EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
102 EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); 105 EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
103 EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); 106 EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
104 #endif 107 #endif
(...skipping 23 matching lines...) Expand all
128 /* This will initialise the built-in compression algorithms. 131 /* This will initialise the built-in compression algorithms.
129 The value returned is a STACK_OF(SSL_COMP), but that can 132 The value returned is a STACK_OF(SSL_COMP), but that can
130 be discarded safely */ 133 be discarded safely */
131 (void)SSL_COMP_get_compression_methods(); 134 (void)SSL_COMP_get_compression_methods();
132 #endif 135 #endif
133 /* initialize cipher/digest methods table */ 136 /* initialize cipher/digest methods table */
134 ssl_load_ciphers(); 137 ssl_load_ciphers();
135 return(1); 138 return(1);
136 } 139 }
137 140
OLDNEW
« no previous file with comments | « openssl/ssl/ssl3.h ('k') | openssl/ssl/ssl_asn1.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698