From 891537eae13448fd0cbcfab9bde2bfa5bc4c0a1e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 8 Jan 2020 13:15:40 +0100 Subject: [PATCH] get rid of unused use_openssl.sh script --- Makefile | 4 +- build.yaml | 4 -- templates/Makefile.template | 4 +- .../tools/openssl/use_openssl.sh.template | 48 ------------------- tools/openssl/use_openssl.sh | 46 ------------------ 5 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 templates/tools/openssl/use_openssl.sh.template delete mode 100755 tools/openssl/use_openssl.sh diff --git a/Makefile b/Makefile index bcae905d5d3..fc9f6c131b5 100644 --- a/Makefile +++ b/Makefile @@ -643,9 +643,7 @@ endif # Note that for testing purposes, one can do: # make HAS_EMBEDDED_OPENSSL_ALPN=false # to emulate the fact we do not have OpenSSL in the third_party folder. -ifneq ($(wildcard third_party/openssl-1.0.2f/libssl.a),) -HAS_EMBEDDED_OPENSSL_ALPN = third_party/openssl-1.0.2f -else ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),) +ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),) HAS_EMBEDDED_OPENSSL_ALPN = false else CAN_COMPILE_EMBEDDED_OPENSSL ?= $(shell $(BORINGSSL_COMPILE_CHECK_CMD) 2> /dev/null && echo true || echo false) diff --git a/build.yaml b/build.yaml index 1f1d52ec88f..803ae82d86e 100644 --- a/build.yaml +++ b/build.yaml @@ -6263,10 +6263,6 @@ defaults: LDFLAGS: -g zlib: CFLAGS: -fvisibility=hidden -openssl_fallback: - base_uri: https://openssl.org/source/old/1.0.2/ - extraction_dir: openssl-1.0.2f - tarball: openssl-1.0.2f.tar.gz php_config_m4: deps: - grpc diff --git a/templates/Makefile.template b/templates/Makefile.template index 8372d00ae69..1c3b490751e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -537,9 +537,7 @@ # Note that for testing purposes, one can do: # make HAS_EMBEDDED_OPENSSL_ALPN=false # to emulate the fact we do not have OpenSSL in the third_party folder. - ifneq ($(wildcard third_party/${openssl_fallback.extraction_dir}/libssl.a),) - HAS_EMBEDDED_OPENSSL_ALPN = third_party/${openssl_fallback.extraction_dir} - else ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),) + ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),) HAS_EMBEDDED_OPENSSL_ALPN = false else CAN_COMPILE_EMBEDDED_OPENSSL ?= $(shell $(BORINGSSL_COMPILE_CHECK_CMD) 2> /dev/null && echo true || echo false) diff --git a/templates/tools/openssl/use_openssl.sh.template b/templates/tools/openssl/use_openssl.sh.template deleted file mode 100644 index b07ce132052..00000000000 --- a/templates/tools/openssl/use_openssl.sh.template +++ /dev/null @@ -1,48 +0,0 @@ -%YAML 1.2 ---- | - #!/bin/bash - - # Copyright 2015 gRPC authors. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - - set -ex - - cd "$(dirname "$0")/../.." - set root=`pwd` - CC=${"${CC:-cc}"} - - # allow openssl to be pre-downloaded - if [ ! -e third_party/${openssl_fallback.tarball} ] - then - echo "Downloading ${openssl_fallback.base_uri + openssl_fallback.tarball} to third_party/${openssl_fallback.tarball}" - wget ${openssl_fallback.base_uri + openssl_fallback.tarball} -O third_party/${openssl_fallback.tarball} - fi - - # clean openssl directory - rm -rf third_party/${openssl_fallback.extraction_dir} - - # extract archive - cd third_party - tar xfz ${openssl_fallback.tarball} - - # build openssl - cd ${openssl_fallback.extraction_dir} - CC="$CC -fPIC -fvisibility=hidden" ./config no-asm - make - - # generate the 'grpc_obj' directory needed by the makefile - mkdir grpc_obj - cd grpc_obj - ar x ../libcrypto.a - ar x ../libssl.a diff --git a/tools/openssl/use_openssl.sh b/tools/openssl/use_openssl.sh deleted file mode 100755 index dea16ca6ee9..00000000000 --- a/tools/openssl/use_openssl.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -cd "$(dirname "$0")/../.." -set root=`pwd` -CC=${CC:-cc} - -# allow openssl to be pre-downloaded -if [ ! -e third_party/openssl-1.0.2f.tar.gz ] -then - echo "Downloading https://openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz to third_party/openssl-1.0.2f.tar.gz" - wget https://openssl.org/source/old/1.0.2/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 - -# 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 - -# generate the 'grpc_obj' directory needed by the makefile -mkdir grpc_obj -cd grpc_obj -ar x ../libcrypto.a -ar x ../libssl.a