From 68e57b904c65738c18d862080f3cd655261d9289 Mon Sep 17 00:00:00 2001 From: Ammako <43770697+Ammako@users.noreply.github.com> Date: Sat, 24 Jul 2021 08:45:54 -0400 Subject: [PATCH] Only enable TLSv1/TLSv1.1 at runtime Only for cm-14.1 and lineage-15.1 branches --- Dockerfile | 2 -- src/build.sh | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f67b2b..342b74a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,8 +151,6 @@ RUN apt-get -qq update && \ RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \ chmod a+x /usr/local/bin/repo -RUN sed -i 's/, TLSv1, TLSv1.1,/,/' /etc/java-8-openjdk/security/java.security - # Copy required files ##################### COPY src/ /root/ diff --git a/src/build.sh b/src/build.sh index 2d33441..d80a43a 100755 --- a/src/build.sh +++ b/src/build.sh @@ -89,12 +89,16 @@ for branch in ${BRANCH_NAME//,/ }; do permissioncontroller_patch="" case "$branch" in cm-14.1*) + sed -i 's/, TLSv1, TLSv1.1,/,/' "/etc/java-8-openjdk/security/java.security" + echo ">> [$(date)] Re-enabling support for TLSv1 and TLSv1.1 in OpenJDK 8 config" vendor="cm" themuppets_branch="cm-14.1" android_version="7.1.2" patch_name="android_frameworks_base-N.patch" ;; lineage-15.1*) + sed -i 's/, TLSv1, TLSv1.1,/,/' "/etc/java-8-openjdk/security/java.security" + echo ">> [$(date)] Re-enabling support for TLSv1 and TLSv1.1 in OpenJDK 8 config" themuppets_branch="lineage-15.1" android_version="8.1" patch_name="android_frameworks_base-O.patch"