diff --git a/INSTALL b/INSTALL index 48511aff7df9bb9650aa58037c9c5c8b6d272d6a..bba923ccae3bdf9041abac56d7714453e2a3621e 100644 --- a/INSTALL +++ b/INSTALL @@ -58,7 +58,7 @@ for that particular dependency if you want to reduce the libraries' size. The recommended version of OpenSSL that provides ALPN support is available at this URL: - https://www.openssl.org/source/openssl-1.0.2-beta3.tar.gz + https://www.openssl.org/source/openssl-1.0.2.tar.gz Dependencies to compile and run the tests @@ -101,7 +101,7 @@ A word on OpenSSL Secure HTTP2 requires to have the TLS extension ALPN (see rfc 7301 and http://http2.github.io/http2-spec/ section 3.3). Our HTTP2 implementation -relies on OpenSSL's implementation. OpenSSL 1.0.2beta3 is the first version +relies on OpenSSL's implementation. OpenSSL 1.0.2 is the first released version of OpenSSL that has ALPN support, and this explains our dependency on it. Note that the Makefile supports compiling only the unsecure elements of grpc, diff --git a/third_party/openssl b/third_party/openssl index 2c5db8dac3a06fe5b2c889838a606138ee3542ed..4ac0329582829f5378d8078c8d314ad37db87736 160000 --- a/third_party/openssl +++ b/third_party/openssl @@ -1 +1 @@ -Subproject commit 2c5db8dac3a06fe5b2c889838a606138ee3542ed +Subproject commit 4ac0329582829f5378d8078c8d314ad37db87736 diff --git a/vsprojects/third_party/openssl/OpenSSL.mak b/vsprojects/third_party/openssl/OpenSSL.mak index 09344e8ae103fd9a26e3a0d212fbe8f85b723d6a..8b1167094aabc91d627dbb9c66b184e020f9d8d9 100644 --- a/vsprojects/third_party/openssl/OpenSSL.mak +++ b/vsprojects/third_party/openssl/OpenSSL.mak @@ -206,13 +206,13 @@ SSLOBJ=$(OBJ_D)\s2_meth.obj \ $(OBJ_D)\t1_lib.obj $(OBJ_D)\t1_enc.obj $(OBJ_D)\t1_ext.obj \ $(OBJ_D)\d1_meth.obj $(OBJ_D)\d1_srvr.obj $(OBJ_D)\d1_clnt.obj \ $(OBJ_D)\d1_lib.obj $(OBJ_D)\d1_pkt.obj $(OBJ_D)\d1_both.obj \ - $(OBJ_D)\d1_enc.obj $(OBJ_D)\d1_srtp.obj $(OBJ_D)\ssl_lib.obj \ - $(OBJ_D)\ssl_err2.obj $(OBJ_D)\ssl_cert.obj $(OBJ_D)\ssl_sess.obj \ - $(OBJ_D)\ssl_ciph.obj $(OBJ_D)\ssl_stat.obj $(OBJ_D)\ssl_rsa.obj \ - $(OBJ_D)\ssl_asn1.obj $(OBJ_D)\ssl_txt.obj $(OBJ_D)\ssl_algs.obj \ - $(OBJ_D)\ssl_conf.obj $(OBJ_D)\bio_ssl.obj $(OBJ_D)\ssl_err.obj \ - $(OBJ_D)\kssl.obj $(OBJ_D)\t1_reneg.obj $(OBJ_D)\tls_srp.obj \ - $(OBJ_D)\t1_trce.obj $(OBJ_D)\ssl_utst.obj + $(OBJ_D)\d1_srtp.obj $(OBJ_D)\ssl_lib.obj $(OBJ_D)\ssl_err2.obj \ + $(OBJ_D)\ssl_cert.obj $(OBJ_D)\ssl_sess.obj $(OBJ_D)\ssl_ciph.obj \ + $(OBJ_D)\ssl_stat.obj $(OBJ_D)\ssl_rsa.obj $(OBJ_D)\ssl_asn1.obj \ + $(OBJ_D)\ssl_txt.obj $(OBJ_D)\ssl_algs.obj $(OBJ_D)\ssl_conf.obj \ + $(OBJ_D)\bio_ssl.obj $(OBJ_D)\ssl_err.obj $(OBJ_D)\kssl.obj \ + $(OBJ_D)\t1_reneg.obj $(OBJ_D)\tls_srp.obj $(OBJ_D)\t1_trce.obj \ + $(OBJ_D)\ssl_utst.obj CRYPTOOBJ=$(OBJ_D)\cryptlib.obj \ $(OBJ_D)\mem.obj $(OBJ_D)\mem_dbg.obj $(OBJ_D)\cversion.obj \ @@ -1277,9 +1277,6 @@ $(OBJ_D)\d1_pkt.obj: $(SRC_D)\ssl\d1_pkt.c $(OBJ_D)\d1_both.obj: $(SRC_D)\ssl\d1_both.c $(CC) /Fo$(OBJ_D)\d1_both.obj $(LIB_CFLAGS) -c $(SRC_D)\ssl\d1_both.c -$(OBJ_D)\d1_enc.obj: $(SRC_D)\ssl\d1_enc.c - $(CC) /Fo$(OBJ_D)\d1_enc.obj $(LIB_CFLAGS) -c $(SRC_D)\ssl\d1_enc.c - $(OBJ_D)\d1_srtp.obj: $(SRC_D)\ssl\d1_srtp.c $(CC) /Fo$(OBJ_D)\d1_srtp.obj $(LIB_CFLAGS) -c $(SRC_D)\ssl\d1_srtp.c