Skip to content

Commit cccd9f5

Browse files
authored
Merge pull request #331 from Jakuje/fix-ci
Fix CI pipelines
2 parents 548e42a + 679e3ed commit cccd9f5

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,11 @@ jobs:
117117
- name: Install SoftHSM
118118
run: |
119119
if [ "${{ matrix.target }}" = "i686-unknown-linux-gnu" ]; then
120+
# the default image is bloated so remove set of needless packages that we would have to update
121+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 firefox snapd mysql*
120122
sudo dpkg --add-architecture i386
121123
sudo apt-get update -y -qq
124+
sudo apt-get upgrade -y -qq
122125
sudo apt-get install -y -qq gcc-multilib:i386 libsofthsm2:i386 gcc:i386
123126
else
124127
sudo apt-get update -y -qq

cryptoki/tests/basic.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,16 @@ fn sign_verify_eddsa_with_ed25519_schemes() -> TestResult {
154154

155155
let data = [0xFF, 0x55, 0xDD];
156156

157-
let schemes = [
157+
let mut schemes = vec![
158158
EddsaSignatureScheme::Ed25519,
159-
EddsaSignatureScheme::Ed25519ctx(b"context"),
160159
EddsaSignatureScheme::Ed25519ph(&[]),
161160
EddsaSignatureScheme::Ed25519ph(b"context"),
162161
];
162+
if !is_fips(&session) {
163+
// The Ed25519Ctx variant is not FIPS approved
164+
// https://github.com/openssl/openssl/issues/27502
165+
schemes.push(EddsaSignatureScheme::Ed25519ctx(b"context"))
166+
}
163167

164168
for scheme in schemes {
165169
let params = EddsaParams::new(scheme);

0 commit comments

Comments
 (0)