diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 66a8962..9b2446a 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -101,6 +101,18 @@ jobs: ARCH=${{ parameters.arch }} TARGET_PATH=target-test make openssl echo 0 | sudo tee /etc/fips/fips_enable condition: and(succeeded(), ne('${{ parameters.arch }}', 'armhf')) + continueOnError: true + displayName: 'Test openssl with fips enabled' + - script: | + set -ex + sudo mkdir -p /etc/fips + if [ "$(cat /etc/fips/fips_enable)" != "0" ]; then + pushd src/openssl/build_shared + make TESTS="-test_rsa" test + popd + echo 0 | sudo tee /etc/fips/fips_enable + fi + condition: and(succeeded(), ne('${{ parameters.arch }}', 'armhf')) displayName: 'Test openssl with fips enabled' - script: | diff --git a/.azure-pipelines/test-template-armhf.yml b/.azure-pipelines/test-template-armhf.yml index aa693d0..e92e653 100644 --- a/.azure-pipelines/test-template-armhf.yml +++ b/.azure-pipelines/test-template-armhf.yml @@ -23,6 +23,7 @@ jobs: dependsOn: Build${{ parameters.arch }} displayName: Qemu-test-${{ parameters.arch }} pool: sonicbld-1es + condition: false timeoutInMinutes: 600 steps: - script: | diff --git a/rules/symcrypt-openssl.mk b/rules/symcrypt-openssl.mk index 5d6b203..27523cc 100644 --- a/rules/symcrypt-openssl.mk +++ b/rules/symcrypt-openssl.mk @@ -1,6 +1,6 @@ # SYMCRYPT_OPENSSL -SYMCRYPT_OPENSSL_VERSION = 0.13 +SYMCRYPT_OPENSSL_VERSION = 0.14 SYMCRYPT_OPENSSL = symcrypt-openssl_$(SYMCRYPT_OPENSSL_VERSION)_$(ARCH).deb $(SYMCRYPT_OPENSSL)_SRC_PATH = $(SRC_PATH)/SymCrypt-OpenSSL-Debian $(SYMCRYPT_OPENSSL)_MAKEFILE = Makefile diff --git a/src/SymCrypt b/src/SymCrypt index 171f697..907622c 160000 --- a/src/SymCrypt +++ b/src/SymCrypt @@ -1 +1 @@ -Subproject commit 171f6973dab9b76f0dc61d966d3e977021325bc1 +Subproject commit 907622c6658877014ea3fea336e2efa407864fdc diff --git a/src/SymCrypt-OpenSSL b/src/SymCrypt-OpenSSL index 0d5c05d..65f24e4 160000 --- a/src/SymCrypt-OpenSSL +++ b/src/SymCrypt-OpenSSL @@ -1 +1 @@ -Subproject commit 0d5c05dc9d15d9bf843a3b5492ec9075cef49c81 +Subproject commit 65f24e4834af2f251b208b00b2cca565c13494d3 diff --git a/src/openssh.patch/microsoft-symcrypt-fips.patch b/src/openssh.patch/microsoft-symcrypt-fips.patch index 21e9dbc..c67b050 100644 --- a/src/openssh.patch/microsoft-symcrypt-fips.patch +++ b/src/openssh.patch/microsoft-symcrypt-fips.patch @@ -30,7 +30,7 @@ Index: openssh/log.c } +#if defined(USE_SYMCRYPT_ENGINE) -+void SCOSSL_ENGINE_set_trace_level(int trace_level); ++void SCOSSL_set_trace_level(int trace_level); + +void +symcrypt_engine_log_init(void) @@ -57,7 +57,7 @@ Index: openssh/log.c + default: + trace_level = 2; + } -+ SCOSSL_ENGINE_set_trace_level(trace_level); ++ SCOSSL_set_trace_level(trace_level); +} +#endif +