Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[202205] Upgrade SymCrypt version to 1.5.1 #69

Draft
wants to merge 5 commits into
base: 202205
Choose a base branch
from
Draft

[202205] Upgrade SymCrypt version to 1.5.1 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
959b3c2
[202205] Upgrade SymCrypt version to 1.5.1
xumia Oct 11, 2024
1e134ec
Change fips enabled test
xumia Oct 22, 2024
abae04e
Fix build issue
xumia Oct 22, 2024
642fdc6
Fix log function change build issue
xumia Oct 23, 2024
072f3a8
Disable the armhf qemu test
xumia Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .azure-pipelines/test-template-armhf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dependsOn: Build${{ parameters.arch }}
displayName: Qemu-test-${{ parameters.arch }}
pool: sonicbld-1es
condition: false
timeoutInMinutes: 600
steps:
- script: |
Expand Down
2 changes: 1 addition & 1 deletion rules/symcrypt-openssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/SymCrypt
Open in desktop
Submodule SymCrypt updated 187 files
2 changes: 1 addition & 1 deletion src/SymCrypt-OpenSSL
Open in desktop
Submodule SymCrypt-OpenSSL updated 129 files
4 changes: 2 additions & 2 deletions src/openssh.patch/microsoft-symcrypt-fips.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
+
Expand Down
Loading