The branch master has been updated via 07fb85cf6191961fcad824d2f8f2b2a0fcba18ce (commit) via 9fc7a053fce0c6d1d0f39e919f16e35405171b10 (commit) from 4612eec35def0523192ee2c406f99ea5bbb184fb (commit)
- Log ----------------------------------------------------------------- commit 07fb85cf6191961fcad824d2f8f2b2a0fcba18ce Author: Tomas Mraz <to...@openssl.org> Date: Wed May 26 13:13:02 2021 +0200 FIPS Checksums CI: use separate directories for the checkouts Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15481) commit 9fc7a053fce0c6d1d0f39e919f16e35405171b10 Author: Tomas Mraz <to...@openssl.org> Date: Tue May 25 18:15:21 2021 +0200 generate_fips_sources: properly include providers/common/der/*.in Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15481) ----------------------------------------------------------------------- Summary of changes: .github/workflows/fips-checksums.yml | 23 ++++++++++++++--------- Configurations/unix-Makefile.tmpl | 9 ++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/fips-checksums.yml b/.github/workflows/fips-checksums.yml index 12953a38fb..8d17cbd5a4 100644 --- a/.github/workflows/fips-checksums.yml +++ b/.github/workflows/fips-checksums.yml @@ -9,16 +9,19 @@ jobs: run: | sudo apt-get update sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install unifdef - - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.base.sha }} - name: create build dirs run: | mkdir ./build-pristine + mkdir ./source-pristine mkdir ./build + mkdir ./source mkdir ./artifact + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.base.sha }} + path: source-pristine - name: config pristine - run: ../config enable-fips && perl configdata.pm --dump + run: ../source-pristine/config enable-fips && perl configdata.pm --dump working-directory: ./build-pristine - name: make build_generated pristine run: make -s build_generated @@ -28,9 +31,9 @@ jobs: working-directory: ./build-pristine - uses: actions/checkout@v2 with: - clean: false + path: source - name: config - run: ../config enable-fips && perl configdata.pm --dump + run: ../source/config enable-fips && perl configdata.pm --dump working-directory: ./build - name: make build_generated run: make -s build_generated @@ -38,9 +41,11 @@ jobs: - name: make fips-checksums run: make fips-checksums working-directory: ./build - - name: update checksums pristine - run: touch providers/fips.checksum.new && make update-fips-checksums - working-directory: ./build-pristine + - name: update checksums + run: | + cp -a build-pristine/providers/fips.module.sources.new source/providers/fips.module.sources + cp -a build-pristine/providers/fips-sources.checksums.new source/providers/fips-sources.checksums + cp -a build-pristine/providers/fips.checksum.new source/providers/fips.checksum - name: make diff-fips-checksums run: make diff-fips-checksums && touch ../artifact/fips_unchanged || ( touch ../artifact/fips_changed ; echo FIPS CHANGED ) working-directory: ./build diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 78db83a377..7855018e3d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1220,12 +1220,6 @@ providers/fips.module.sources.new: \ | sed -e 's/^.*: *//' -e 's/ */ /g' \ | fgrep -f sources-tmp/sources | tr ' ' '\n' \ | sed -E -e '/^include/s:$$:.in:' -e 's:^ *([.][.]/)*$(SRCDIR)::' -e 's:^/::' ; \ - for x in providers/common/include/prov/*.h; do \ - echo providers/common/der/`basename "$$x"`.in; \ - done ; \ - for x in providers/common/der/*.c; do \ - echo "$$x".in; \ - done ; \ for x in `cat sources-tmp/sources`; do \ if [ -f "$(SRCDIR)$$x" ]; then echo $$x | sed 's:^/::' ; fi ; \ done ; \ @@ -1235,7 +1229,8 @@ providers/fips.module.sources.new: \ crypto/ec/asm/*.pl \ crypto/modes/asm/*.pl \ crypto/sha/asm/*.pl \ - crypto/x86_64cpuid.pl; do \ + crypto/x86_64cpuid.pl \ + providers/common/der/*.in; do \ echo "$$x"; \ done \ ) | sed -e 's:/[^/]*/[^/]*/[.][.]/[.][.]/:/:g' -e 's:/[^/]*/[.][.]/:/:g' \