From c8eff1f9218a5dfd2eabee5d36f2e80c68f66881 Mon Sep 17 00:00:00 2001 From: igrkir Date: Tue, 25 Oct 2022 16:02:30 +0300 Subject: [PATCH] update OpenSSL version up to OpenSSL_1_1_1r --- .cirrus.yml | 8 ++++---- .github/before_script.sh | 6 +++--- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/codeql-analysis.yml | 8 ++++---- README.md | 2 +- patches/{openssl_111m.diff => openssl_111r.diff} | 0 .../{openssl_111m_obj.diff => openssl_111r_obj.diff} | 0 ...enssl_111m_tls13.diff => openssl_111r_tls13.diff} | 0 8 files changed, 18 insertions(+), 18 deletions(-) rename patches/{openssl_111m.diff => openssl_111r.diff} (100%) rename patches/{openssl_111m_obj.diff => openssl_111r_obj.diff} (100%) rename patches/{openssl_111m_tls13.diff => openssl_111r_tls13.diff} (100%) diff --git a/.cirrus.yml b/.cirrus.yml index 01018b4..9921cf6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,16 +4,16 @@ FreeBSD_task: env: PREFIX: ${HOME}/opt PATH: ${PREFIX}/bin:${PATH} - OPENSSL_BRANCH: OpenSSL_1_1_1m + OPENSSL_BRANCH: OpenSSL_1_1_1r install_script: - pkg install -y git cmake p5-App-cpanminus gdb pkgconf - sudo cpanm --notest Test2::V0 script: - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git - cd openssl - - patch -p0 < ../patches/openssl_111m.diff - - patch -p0 < ../patches/openssl_111m_obj.diff - - patch -p0 < ../patches/openssl_111m_tls13.diff + - patch -p0 < ../patches/openssl_111r.diff + - patch -p0 < ../patches/openssl_111r_obj.diff + - patch -p0 < ../patches/openssl_111r_tls13.diff - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && make all install_sw > build.log 2>&1 || (cat build.log && exit 1) - cd .. - mkdir build diff --git a/.github/before_script.sh b/.github/before_script.sh index 50c4fc8..70342c3 100755 --- a/.github/before_script.sh +++ b/.github/before_script.sh @@ -9,9 +9,9 @@ fi git clone --depth 1 -b $OPENSSL_BRANCH https://github.com/openssl/openssl.git cd openssl -patch -p0 < ../patches/openssl_111m.diff -patch -p0 < ../patches/openssl_111m_obj.diff -patch -p0 < ../patches/openssl_111m_tls13.diff +patch -p0 < ../patches/openssl_111r.diff +patch -p0 < ../patches/openssl_111r_obj.diff +patch -p0 < ../patches/openssl_111r_tls13.diff git describe --always --long PREFIX=$HOME/opt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29f9169..cfddcd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,17 +2,17 @@ name: CI on: [push, pull_request] env: - OPENSSL_BRANCH: OpenSSL_1_1_1m + OPENSSL_BRANCH: OpenSSL_1_1_1r jobs: - gcc-openssl-111m: + gcc-openssl-111r: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - run: .github/before_script.sh - run: .github/script.sh - clang-openssl-111m: + clang-openssl-111r: runs-on: ubuntu-20.04 env: CC: clang @@ -21,17 +21,17 @@ jobs: - run: .github/before_script.sh - run: .github/script.sh - gcc-asan-openssl-111m: + gcc-asan-openssl-111r: runs-on: ubuntu-20.04 env: - OPENSSL_BRANCH: OpenSSL_1_1_1m + OPENSSL_BRANCH: OpenSSL_1_1_1r ASAN: -DASAN=1 steps: - uses: actions/checkout@v2 - run: .github/before_script.sh - run: .github/script.sh - gcc-openssl-111m-x86: + gcc-openssl-111r-x86: runs-on: ubuntu-20.04 env: CFLAGS: -m32 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f2b3a99..6cc3711 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,7 +1,7 @@ name: "CodeQL" env: - OPENSSL_BRANCH: OpenSSL_1_1_1m + OPENSSL_BRANCH: OpenSSL_1_1_1r #RPATH: "-Wl,-rpath=${PREFIX}/lib" #PREFIX: ${HOME}/opt #PATH: ${PREFIX}/bin:${PATH} @@ -60,9 +60,9 @@ jobs: export PREFIX=`pwd`/opt export RPATH="-Wl,-rpath=${PREFIX}/lib" cd openssl - patch -p0 < ../patches/openssl_111m.diff - patch -p0 < ../patches/openssl_111m_obj.diff - patch -p0 < ../patches/openssl_111m_tls13.diff + patch -p0 < ../patches/openssl_111r.diff + patch -p0 < ../patches/openssl_111r_obj.diff + patch -p0 < ../patches/openssl_111r_tls13.diff git describe --always --long ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} ${RPATH} make -s build_libs diff --git a/README.md b/README.md index 1fa4acd..82e8e2f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A reference implementation of the Russian GOST crypto algorithms for OpenSSL Compatibility: OpenSSL 1.1.1 (needs patches) *This branch should not compile with vanilla OpenSSL 1.1.1! -It requires patching OpenSSL using the patches/openssl_111m.diff* +It requires patching OpenSSL using the patches/openssl_111r.diff* License: same as the corresponding version of OpenSSL. diff --git a/patches/openssl_111m.diff b/patches/openssl_111r.diff similarity index 100% rename from patches/openssl_111m.diff rename to patches/openssl_111r.diff diff --git a/patches/openssl_111m_obj.diff b/patches/openssl_111r_obj.diff similarity index 100% rename from patches/openssl_111m_obj.diff rename to patches/openssl_111r_obj.diff diff --git a/patches/openssl_111m_tls13.diff b/patches/openssl_111r_tls13.diff similarity index 100% rename from patches/openssl_111m_tls13.diff rename to patches/openssl_111r_tls13.diff -- 2.39.2