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

Side by Side Diff: openssl/crypto/ossl_typ.h

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/opensslv.h ('k') | openssl/crypto/pem/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* ==================================================================== 1 /* ====================================================================
2 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. 2 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 typedef struct asn1_string_st ASN1_BMPSTRING; 88 typedef struct asn1_string_st ASN1_BMPSTRING;
89 typedef struct asn1_string_st ASN1_UTCTIME; 89 typedef struct asn1_string_st ASN1_UTCTIME;
90 typedef struct asn1_string_st ASN1_TIME; 90 typedef struct asn1_string_st ASN1_TIME;
91 typedef struct asn1_string_st ASN1_GENERALIZEDTIME; 91 typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
92 typedef struct asn1_string_st ASN1_VISIBLESTRING; 92 typedef struct asn1_string_st ASN1_VISIBLESTRING;
93 typedef struct asn1_string_st ASN1_UTF8STRING; 93 typedef struct asn1_string_st ASN1_UTF8STRING;
94 typedef int ASN1_BOOLEAN; 94 typedef int ASN1_BOOLEAN;
95 typedef int ASN1_NULL; 95 typedef int ASN1_NULL;
96 #endif 96 #endif
97 97
98 typedef struct asn1_pctx_st ASN1_PCTX;
99
98 #ifdef OPENSSL_SYS_WIN32 100 #ifdef OPENSSL_SYS_WIN32
99 #undef X509_NAME 101 #undef X509_NAME
100 #undef X509_EXTENSIONS 102 #undef X509_EXTENSIONS
101 #undef X509_CERT_PAIR 103 #undef X509_CERT_PAIR
102 #undef PKCS7_ISSUER_AND_SERIAL 104 #undef PKCS7_ISSUER_AND_SERIAL
103 #undef OCSP_REQUEST 105 #undef OCSP_REQUEST
104 #undef OCSP_RESPONSE 106 #undef OCSP_RESPONSE
105 #endif 107 #endif
106 108
107 #ifdef BIGNUM 109 #ifdef BIGNUM
108 #undef BIGNUM 110 #undef BIGNUM
109 #endif 111 #endif
110 typedef struct bignum_st BIGNUM; 112 typedef struct bignum_st BIGNUM;
111 typedef struct bignum_ctx BN_CTX; 113 typedef struct bignum_ctx BN_CTX;
112 typedef struct bn_blinding_st BN_BLINDING; 114 typedef struct bn_blinding_st BN_BLINDING;
113 typedef struct bn_mont_ctx_st BN_MONT_CTX; 115 typedef struct bn_mont_ctx_st BN_MONT_CTX;
114 typedef struct bn_recp_ctx_st BN_RECP_CTX; 116 typedef struct bn_recp_ctx_st BN_RECP_CTX;
115 typedef struct bn_gencb_st BN_GENCB; 117 typedef struct bn_gencb_st BN_GENCB;
116 118
117 typedef struct buf_mem_st BUF_MEM; 119 typedef struct buf_mem_st BUF_MEM;
118 120
119 typedef struct evp_cipher_st EVP_CIPHER; 121 typedef struct evp_cipher_st EVP_CIPHER;
120 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; 122 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
121 typedef struct env_md_st EVP_MD; 123 typedef struct env_md_st EVP_MD;
122 typedef struct env_md_ctx_st EVP_MD_CTX; 124 typedef struct env_md_ctx_st EVP_MD_CTX;
123 typedef struct evp_pkey_st EVP_PKEY; 125 typedef struct evp_pkey_st EVP_PKEY;
124 126
127 typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
128
129 typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
130 typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
131
125 typedef struct dh_st DH; 132 typedef struct dh_st DH;
126 typedef struct dh_method DH_METHOD; 133 typedef struct dh_method DH_METHOD;
127 134
128 typedef struct dsa_st DSA; 135 typedef struct dsa_st DSA;
129 typedef struct dsa_method DSA_METHOD; 136 typedef struct dsa_method DSA_METHOD;
130 137
131 typedef struct rsa_st RSA; 138 typedef struct rsa_st RSA;
132 typedef struct rsa_meth_st RSA_METHOD; 139 typedef struct rsa_meth_st RSA_METHOD;
133 140
134 typedef struct rand_meth_st RAND_METHOD; 141 typedef struct rand_meth_st RAND_METHOD;
135 142
136 typedef struct ecdh_method ECDH_METHOD; 143 typedef struct ecdh_method ECDH_METHOD;
137 typedef struct ecdsa_method ECDSA_METHOD; 144 typedef struct ecdsa_method ECDSA_METHOD;
138 145
139 typedef struct x509_st X509; 146 typedef struct x509_st X509;
140 typedef struct X509_algor_st X509_ALGOR; 147 typedef struct X509_algor_st X509_ALGOR;
141 typedef struct X509_crl_st X509_CRL; 148 typedef struct X509_crl_st X509_CRL;
149 typedef struct x509_crl_method_st X509_CRL_METHOD;
150 typedef struct x509_revoked_st X509_REVOKED;
142 typedef struct X509_name_st X509_NAME; 151 typedef struct X509_name_st X509_NAME;
152 typedef struct X509_pubkey_st X509_PUBKEY;
143 typedef struct x509_store_st X509_STORE; 153 typedef struct x509_store_st X509_STORE;
144 typedef struct x509_store_ctx_st X509_STORE_CTX; 154 typedef struct x509_store_ctx_st X509_STORE_CTX;
145 typedef struct ssl_st SSL; 155
146 typedef struct ssl_ctx_st SSL_CTX; 156 typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
147 157
148 typedef struct v3_ext_ctx X509V3_CTX; 158 typedef struct v3_ext_ctx X509V3_CTX;
149 typedef struct conf_st CONF; 159 typedef struct conf_st CONF;
150 160
151 typedef struct store_st STORE; 161 typedef struct store_st STORE;
152 typedef struct store_method_st STORE_METHOD; 162 typedef struct store_method_st STORE_METHOD;
153 163
154 typedef struct ui_st UI; 164 typedef struct ui_st UI;
155 typedef struct ui_method_st UI_METHOD; 165 typedef struct ui_method_st UI_METHOD;
156 166
157 typedef struct st_ERR_FNS ERR_FNS; 167 typedef struct st_ERR_FNS ERR_FNS;
158 168
159 typedef struct engine_st ENGINE; 169 typedef struct engine_st ENGINE;
170 typedef struct ssl_st SSL;
171 typedef struct ssl_ctx_st SSL_CTX;
160 172
161 typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; 173 typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
162 typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; 174 typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
163 typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; 175 typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
164 typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; 176 typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
165 177
178 typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
179 typedef struct DIST_POINT_st DIST_POINT;
180 typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
181 typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
182
166 /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */ 183 /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
167 #define DECLARE_PKCS12_STACK_OF(type) /* Nothing */ 184 #define DECLARE_PKCS12_STACK_OF(type) /* Nothing */
168 #define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */ 185 #define IMPLEMENT_PKCS12_STACK_OF(type) /* Nothing */
169 186
170 typedef struct crypto_ex_data_st CRYPTO_EX_DATA; 187 typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
171 /* Callback types for crypto.h */ 188 /* Callback types for crypto.h */
172 typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad, 189 typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
173 int idx, long argl, void *argp); 190 int idx, long argl, void *argp);
174 typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, 191 typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
175 int idx, long argl, void *argp); 192 int idx, long argl, void *argp);
176 typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d , 193 typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d ,
177 int idx, long argl, void *argp); 194 int idx, long argl, void *argp);
178 195
179 typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; 196 typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
180 typedef struct ocsp_response_st OCSP_RESPONSE; 197 typedef struct ocsp_response_st OCSP_RESPONSE;
181 typedef struct ocsp_responder_id_st OCSP_RESPID; 198 typedef struct ocsp_responder_id_st OCSP_RESPID;
182 199
183 #endif /* def HEADER_OPENSSL_TYPES_H */ 200 #endif /* def HEADER_OPENSSL_TYPES_H */
OLDNEW
« no previous file with comments | « openssl/crypto/opensslv.h ('k') | openssl/crypto/pem/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698