Skip to content

Commit de25891

Browse files
Willy Zhangwillyzha
authored andcommitted
Update softhsm docker base image with OpenSSL 3.4
1 parent 60d6d38 commit de25891

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

util/containers/softhsm2/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Licensed under the Apache License, Version 2.0, see LICENSE for details.
33
# SPDX-License-Identifier: Apache-2.0
44

5-
# Docker container used to build and run SoftHSM2.
5+
# Use Debian Sid (Unstable) which ships with OpenSSL 3.4+
6+
FROM debian:sid-slim
67

7-
FROM ubuntu:22.04
88
LABEL version="1.0"
99
LABEL description="OpenTitan provisioning SoftHSM2 container."
1010

@@ -32,11 +32,10 @@ ENV LANG en_US.UTF-8
3232
ENV LANGUAGE en_US:en
3333

3434
# Clone SoftHSM2.
35-
# Note: this commit hash should be kept in sync with that in:
36-
# third_party/softhsm2/deps.bzl
37-
ARG SOFTHSM2_COMMIT_HASH=4975c0df4c7090e97a3860ae21079a9597cfedc6
35+
# Note: this commit hash should be kept in sync with that in MODULE.bazel
36+
ARG SOFTHSM2_COMMIT_HASH=5fe2207418cd066142d122ea2c0c67f7831b6a63
3837
RUN cd /opt && \
39-
git clone https://github.com/opendnssec/SoftHSMv2.git && \
38+
git clone https://github.com/antoinelochet/SoftHSMv2.git && \
4039
cd SoftHSMv2 && \
4140
git reset --hard ${SOFTHSM2_COMMIT_HASH}
4241

@@ -49,7 +48,7 @@ RUN cd /opt/SoftHSMv2 && \
4948
./autogen.sh && \
5049
./configure \
5150
--enable-ecc \
52-
--disable-p11-kit \
51+
--enable-mldsa \
5352
--disable-p11-kit \
5453
--with-crypto-backend=openssl \
5554
--localstatedir=/opt/SoftHSMv2 \

0 commit comments

Comments
 (0)