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

Side by Side Diff: openssl/crypto/err/err_all.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/crypto/err/err.c ('k') | openssl/crypto/err/err_bio.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 /* crypto/err/err_all.c */ 1 /* crypto/err/err_all.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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 */ 57 */
58 58
59 #include <stdio.h> 59 #include <stdio.h>
60 #include <openssl/asn1.h> 60 #include <openssl/asn1.h>
61 #include <openssl/bn.h> 61 #include <openssl/bn.h>
62 #ifndef OPENSSL_NO_EC 62 #ifndef OPENSSL_NO_EC
63 #include <openssl/ec.h> 63 #include <openssl/ec.h>
64 #endif 64 #endif
65 #include <openssl/buffer.h> 65 #include <openssl/buffer.h>
66 #include <openssl/bio.h> 66 #include <openssl/bio.h>
67 #include <openssl/comp.h>
67 #ifndef OPENSSL_NO_RSA 68 #ifndef OPENSSL_NO_RSA
68 #include <openssl/rsa.h> 69 #include <openssl/rsa.h>
69 #endif 70 #endif
70 #ifndef OPENSSL_NO_DH 71 #ifndef OPENSSL_NO_DH
71 #include <openssl/dh.h> 72 #include <openssl/dh.h>
72 #endif 73 #endif
73 #ifndef OPENSSL_NO_DSA 74 #ifndef OPENSSL_NO_DSA
74 #include <openssl/dsa.h> 75 #include <openssl/dsa.h>
75 #endif 76 #endif
76 #ifndef OPENSSL_NO_ECDSA 77 #ifndef OPENSSL_NO_ECDSA
(...skipping 10 matching lines...) Expand all
87 #include <openssl/conf.h> 88 #include <openssl/conf.h>
88 #include <openssl/pkcs12.h> 89 #include <openssl/pkcs12.h>
89 #include <openssl/rand.h> 90 #include <openssl/rand.h>
90 #include <openssl/dso.h> 91 #include <openssl/dso.h>
91 #ifndef OPENSSL_NO_ENGINE 92 #ifndef OPENSSL_NO_ENGINE
92 #include <openssl/engine.h> 93 #include <openssl/engine.h>
93 #endif 94 #endif
94 #include <openssl/ui.h> 95 #include <openssl/ui.h>
95 #include <openssl/ocsp.h> 96 #include <openssl/ocsp.h>
96 #include <openssl/err.h> 97 #include <openssl/err.h>
97 #ifdef OPENSSL_FIPS 98 #include <openssl/ts.h>
98 #include <openssl/fips.h>
99 #endif
100
101 #ifndef OPENSSL_NO_CMS 99 #ifndef OPENSSL_NO_CMS
102 #include <openssl/cms.h> 100 #include <openssl/cms.h>
103 #endif 101 #endif
104 #ifndef OPENSSL_NO_JPAKE 102 #ifndef OPENSSL_NO_JPAKE
105 #include <openssl/jpake.h> 103 #include <openssl/jpake.h>
106 #endif 104 #endif
107 #include <openssl/comp.h> 105 #include <openssl/comp.h>
108 106
109 void ERR_load_crypto_strings(void) 107 void ERR_load_crypto_strings(void)
110 { 108 {
(...skipping 10 matching lines...) Expand all
121 ERR_load_BUF_strings(); 119 ERR_load_BUF_strings();
122 ERR_load_OBJ_strings(); 120 ERR_load_OBJ_strings();
123 ERR_load_PEM_strings(); 121 ERR_load_PEM_strings();
124 #ifndef OPENSSL_NO_DSA 122 #ifndef OPENSSL_NO_DSA
125 ERR_load_DSA_strings(); 123 ERR_load_DSA_strings();
126 #endif 124 #endif
127 ERR_load_X509_strings(); 125 ERR_load_X509_strings();
128 ERR_load_ASN1_strings(); 126 ERR_load_ASN1_strings();
129 ERR_load_CONF_strings(); 127 ERR_load_CONF_strings();
130 ERR_load_CRYPTO_strings(); 128 ERR_load_CRYPTO_strings();
129 ERR_load_COMP_strings();
131 #ifndef OPENSSL_NO_EC 130 #ifndef OPENSSL_NO_EC
132 ERR_load_EC_strings(); 131 ERR_load_EC_strings();
133 #endif 132 #endif
134 #ifndef OPENSSL_NO_ECDSA 133 #ifndef OPENSSL_NO_ECDSA
135 ERR_load_ECDSA_strings(); 134 ERR_load_ECDSA_strings();
136 #endif 135 #endif
137 #ifndef OPENSSL_NO_ECDH 136 #ifndef OPENSSL_NO_ECDH
138 ERR_load_ECDH_strings(); 137 ERR_load_ECDH_strings();
139 #endif 138 #endif
140 /* skip ERR_load_SSL_strings() because it is not in this library */ 139 /* skip ERR_load_SSL_strings() because it is not in this library */
141 ERR_load_BIO_strings(); 140 ERR_load_BIO_strings();
142 ERR_load_PKCS7_strings(); 141 ERR_load_PKCS7_strings();
143 ERR_load_X509V3_strings(); 142 ERR_load_X509V3_strings();
144 ERR_load_PKCS12_strings(); 143 ERR_load_PKCS12_strings();
145 ERR_load_RAND_strings(); 144 ERR_load_RAND_strings();
146 ERR_load_DSO_strings(); 145 ERR_load_DSO_strings();
146 ERR_load_TS_strings();
147 #ifndef OPENSSL_NO_ENGINE 147 #ifndef OPENSSL_NO_ENGINE
148 ERR_load_ENGINE_strings(); 148 ERR_load_ENGINE_strings();
149 #endif 149 #endif
150 ERR_load_OCSP_strings(); 150 ERR_load_OCSP_strings();
151 ERR_load_UI_strings(); 151 ERR_load_UI_strings();
152 #ifdef OPENSSL_FIPS
153 ERR_load_FIPS_strings();
154 #endif
155 #ifndef OPENSSL_NO_CMS 152 #ifndef OPENSSL_NO_CMS
156 ERR_load_CMS_strings(); 153 ERR_load_CMS_strings();
157 #endif 154 #endif
158 #ifndef OPENSSL_NO_JPAKE 155 #ifndef OPENSSL_NO_JPAKE
159 ERR_load_JPAKE_strings(); 156 ERR_load_JPAKE_strings();
160 #endif 157 #endif
161 ERR_load_COMP_strings(); 158 ERR_load_COMP_strings();
162 #endif 159 #endif
163 } 160 }
OLDNEW
« no previous file with comments | « openssl/crypto/err/err.c ('k') | openssl/crypto/err/err_bio.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698