upgrade openssl to 1.02.g

cocos2d · Apr 5, 2016 · 66c86a8 · 66c86a8
1 parent 5b6fa8a
commit 66c86a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/build/main.ini b/build/main.ini
@@ -5,17 +5,29 @@ cfg_all_valid_platforms=(tvos ios mac android linux tizen)
 #copy libraries header files
 png_header_files=png*.h
 luajit_header_files=luajit-2.0
-lua_header_files=l*.h*
+lua_header_files=l[au]*.h*
 curl_header_files=curl
 freetype_header_files=freetype2
 jpeg_header_files=j*.h
 tiff_header_files=tif*.h
 webp_header_files=webp
-websockets_header_files=l*.h
+websockets_header_files=libwebsockets.h
 zlib_header_files=z*.h
 chipmunk_header_files=chipmunk
+edtaa3func_header_files=edtaa3func.h
+xxhash_header_files=xxhash.h
+xxtea_header_files=xxtea.h
+convertutf_header_files=ConvertUTF.h
+minizip_header_files=minizip
+tinyxml2_header_files=tinyxml2.h
+cjson_header_files=cjson
+luasocket_header_files=luasocket
+box2d_header_files=Box2D
+openssl_header_files=openssl
+glfw_header_files=GLFW
 rapidjson_header_files=rapidjson
-
+sqlite3_header_files=sqlite*.h
+glew_header_files=GL
 
 ##archive prebuilt name
 luajit_original_name=luajit-5.1

diff --git a/contrib/src/openssl/SHA512SUMS b/contrib/src/openssl/SHA512SUMS
@@ -1 +1 @@
-b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f  openssl-1.0.2e.tar.gz
+4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735  openssl-1.0.2g.tar.gz
diff --git a/contrib/src/openssl/rules.mak b/contrib/src/openssl/rules.mak
@@ -1,5 +1,5 @@
 # OPENSSL
-OPENSSL_VERSION := 1.0.2e
+OPENSSL_VERSION := 1.0.2g
 OPENSSL_URL := https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz