| Index: third_party/grpc/tools/openssl/use_openssl.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/close_wsh.py b/third_party/grpc/tools/openssl/use_openssl.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 67%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/close_wsh.py
|
| copy to third_party/grpc/tools/openssl/use_openssl.sh
|
| index 1b02d66267e294ce83977dac64f075981705647c..3098217ec1b54a4cf2f677994fedcf03730b052d
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/close_wsh.py
|
| +++ b/third_party/grpc/tools/openssl/use_openssl.sh
|
| @@ -1,4 +1,6 @@
|
| -# Copyright 2011, Google Inc.
|
| +#!/bin/bash
|
| +
|
| +# Copyright 2015-2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,27 +29,33 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +set -ex
|
|
|
| -import logging
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| -
|
| +cd $(dirname $0)/../..
|
| +set root=`pwd`
|
| +CC=${CC:-cc}
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +# allow openssl to be pre-downloaded
|
| +if [ ! -e third_party/openssl-1.0.2f.tar.gz ]
|
| +then
|
| + echo "Downloading http://openssl.org/source/openssl-1.0.2f.tar.gz to third_party/openssl-1.0.2f.tar.gz"
|
| + wget http://openssl.org/source/openssl-1.0.2f.tar.gz -O third_party/openssl-1.0.2f.tar.gz
|
| +fi
|
|
|
| +# clean openssl directory
|
| +rm -rf third_party/openssl-1.0.2f
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = request.ws_stream.receive_message()
|
| - if line is None:
|
| - return
|
| - if isinstance(line, unicode):
|
| - request.ws_stream.send_message(line, binary=False)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| - else:
|
| - request.ws_stream.send_message(line, binary=True)
|
| +# extract archive
|
| +cd third_party
|
| +tar xfz openssl-1.0.2f.tar.gz
|
|
|
| +# build openssl
|
| +cd openssl-1.0.2f
|
| +CC="$CC -fPIC -fvisibility=hidden" ./config no-asm
|
| +make
|
|
|
| -def web_socket_passive_closing_handshake(request):
|
| - return request.ws_close_code, request.ws_close_reason
|
| +# generate the 'grpc_obj' directory needed by the makefile
|
| +mkdir grpc_obj
|
| +cd grpc_obj
|
| +ar x ../libcrypto.a
|
| +ar x ../libssl.a
|
|
|