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

Unified Diff: openssl/patches/fix_clang_build.patch

Issue 2072073002: Delete bundled copy of OpenSSL and replace with README. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl@master
Patch Set: Delete bundled copy of OpenSSL and replace with README. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « openssl/patches/eng_dyn_dirs.patch ('k') | openssl/patches/fix_lhash_iteration.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl/patches/fix_clang_build.patch
diff --git a/openssl/patches/fix_clang_build.patch b/openssl/patches/fix_clang_build.patch
deleted file mode 100644
index 8f9b8261b530004bf7736a2aa7fb7707be924e4f..0000000000000000000000000000000000000000
--- a/openssl/patches/fix_clang_build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- openssl-1.0.1e.orig/crypto/bio/b_sock.c 2013-03-05 19:12:46.758376542 +0000
-+++ openssl-1.0.1e/crypto/bio/b_sock.c 2013-03-05 19:12:46.948378599 +0000
-@@ -629,7 +629,8 @@ int BIO_get_accept_socket(char *host, in
- struct sockaddr_in6 sa_in6;
- #endif
- } server,client;
-- int s=INVALID_SOCKET,cs,addrlen;
-+ int s=INVALID_SOCKET,cs;
-+ socklen_t addrlen;
- unsigned char ip[4];
- unsigned short port;
- char *str=NULL,*e;
-@@ -704,10 +705,10 @@ int BIO_get_accept_socket(char *host, in
-
- if ((*p_getaddrinfo.f)(h,p,&hint,&res)) break;
-
-- addrlen = res->ai_addrlen<=sizeof(server) ?
-+ addrlen = res->ai_addrlen <= (socklen_t)sizeof(server) ?
- res->ai_addrlen :
-- sizeof(server);
-- memcpy(&server, res->ai_addr, addrlen);
-+ (socklen_t)sizeof(server);
-+ memcpy(&server, res->ai_addr, (size_t)addrlen);
-
- (*p_freeaddrinfo.f)(res);
- goto again;
-@@ -719,7 +720,7 @@ int BIO_get_accept_socket(char *host, in
- memset((char *)&server,0,sizeof(server));
- server.sa_in.sin_family=AF_INET;
- server.sa_in.sin_port=htons(port);
-- addrlen = sizeof(server.sa_in);
-+ addrlen = (socklen_t)sizeof(server.sa_in);
-
- if (h == NULL || strcmp(h,"*") == 0)
- server.sa_in.sin_addr.s_addr=INADDR_ANY;
---- openssl-1.0.1e.orig/crypto/x509v3/v3_utl.c 2013-03-05 19:12:46.768376649 +0000
-+++ openssl-1.0.1e/crypto/x509v3/v3_utl.c 2013-03-05 19:12:46.948378599 +0000
-@@ -365,7 +365,7 @@ char *hex_to_string(const unsigned char
- char *tmp, *q;
- const unsigned char *p;
- int i;
-- const static char hexdig[] = "0123456789ABCDEF";
-+ static const char hexdig[] = "0123456789ABCDEF";
- if(!buffer || !len) return NULL;
- if(!(tmp = OPENSSL_malloc(len * 3 + 1))) {
- X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE);
« no previous file with comments | « openssl/patches/eng_dyn_dirs.patch ('k') | openssl/patches/fix_lhash_iteration.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698