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

Side by Side Diff: patches/fix-clang-build.patch

Issue 10911247: Upstream openssl to version 1.0.1c (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: Created 8 years, 2 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 | « patches/empty_OPENSSL_cpuid_setup.patch ('k') | patches/handshake_cutthrough.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/openssl/crypto/bio/bss_dgram.c b/openssl/crypto/bio/bss_dgram.c
2 index 1b1e4be..3c66dd1 100644
3 --- a/openssl/crypto/bio/bss_dgram.c
4 +++ b/openssl/crypto/bio/bss_dgram.c
5 @@ -447,7 +447,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
6 bio_dgram_data *data = NULL;
7 #if defined(IP_MTU_DISCOVER) || defined(IP_MTU)
8 long sockopt_val = 0;
9 - unsigned int sockopt_len = 0;
10 + socklen_t sockopt_len = 0;
11 #endif
12 #ifdef OPENSSL_SYS_LINUX
13 socklen_t addr_len;
14 diff --git a/openssl/crypto/cryptlib.c b/openssl/crypto/cryptlib.c
15 index 766ea8c..50fd492 100644
16 --- a/openssl/crypto/cryptlib.c
17 +++ b/openssl/crypto/cryptlib.c
18 @@ -504,7 +504,7 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id)
19 CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL));
20 #else
21 /* For everything else, default to using the address of 'errno' */
22 - CRYPTO_THREADID_set_pointer(id, &errno);
23 + CRYPTO_THREADID_set_pointer(id, (void*)&errno);
24 #endif
25 }
26
27 diff --git a/openssl/ssl/ssl_lib.c b/openssl/ssl/ssl_lib.c
28 index 8340854..d6b8ca8 100644
29 --- a/openssl/ssl/ssl_lib.c
30 +++ b/openssl/ssl/ssl_lib.c
31 @@ -160,6 +160,9 @@
32 #include <openssl/engine.h>
33 #endif
34
35 +/* defined in ssl_ciph.c - not exported by any header. */
36 +extern const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher);
37 +
38 const char *SSL_version_str=OPENSSL_VERSION_TEXT;
39
40 SSL3_ENC_METHOD ssl3_undef_enc_method={
OLDNEW
« no previous file with comments | « patches/empty_OPENSSL_cpuid_setup.patch ('k') | patches/handshake_cutthrough.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698