diff mbox series

[Openvpn-devel,3/3] Enable pkcs11 an dtest_pkcs11 in github actions

Message ID 20230322221456.1660425-3-selva.nair@gmail.com
State Accepted
Headers show
Series [Openvpn-devel,1/3] Move digest_sign_verify out of test_cryptoapi.c | expand

Commit Message

Selva Nair March 22, 2023, 10:14 p.m. UTC 
From: Selva Nair <selva.nair@gmail.com>

- Enabled for the Ubuntu 22.04 build (OpenSSL 3) and one of the
  Ubuntu 20.04 builds (OpenSSL 1.1.1).

Signed-off-by: Selva Nair <selva.nair@gmail.com>
---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Frank Lichtenheld March 23, 2023, 8:50 a.m. UTC | #1 
On Wed, Mar 22, 2023 at 06:14:56PM -0400, selva.nair@gmail.com wrote:
> From: Selva Nair <selva.nair@gmail.com>
> 
> - Enabled for the Ubuntu 22.04 build (OpenSSL 3) and one of the
>   Ubuntu 20.04 builds (OpenSSL 1.1.1).
> 
> Signed-off-by: Selva Nair <selva.nair@gmail.com>
> ---
>  .github/workflows/build.yaml | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Worked in the PR, so
Acked-By: Frank Lichtenheld <frank@lichtenheld.com>
Gert Doering March 29, 2023, 9:23 a.m. UTC | #2 
Ran this through GHA, it claims success, and claims having tested this...

[==========] Running 3 test(s).
Slot 0 has a free/uninitialized token.
The token has been initialized and is reassigned to slot 347291425
[ RUN      ] test_pkcs11_ids
[       OK ] test_pkcs11_ids
[ RUN      ] test_tls_ctx_use_pkcs11
[       OK ] test_tls_ctx_use_pkcs11
[ RUN      ] test_tls_ctx_use_pkcs11__management
[       OK ] test_tls_ctx_use_pkcs11__management
Found token (b36c3fa5-a027-3fc0-2be4-05ee94b33f21) with matching token label.
The token (softhsm2_tokens_53u42S/b36c3fa5-a027-3fc0-2be4-05ee94b33f21) has been deleted.
[  PASSED  ] 3 test(s).
[==========] 3 test(s) run.
PASS: pkcs11_testdriver

.. very nice!

Your patch has been applied to the master branch.

commit 9283c3980ff543e20f76fdfb4f4e59d5a9162d62
Author: Selva Nair
Date:   Wed Mar 22 18:14:56 2023 -0400

     Enable pkcs11 an dtest_pkcs11 in github actions

     Signed-off-by: Selva Nair <selva.nair@gmail.com>
     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     Message-Id: <20230322221456.1660425-3-selva.nair@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26485.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a3ca7a2e..2538c818 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -297,11 +297,14 @@  jobs:
             sslpkg: "libssl-dev"
             libname: OpenSSL 3.0.2
             ssllib: openssl
+            pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
+            extraconf: --enable-pkcs11
           - os: ubuntu-20.04
             sslpkg: "libssl-dev"
             libname: OpenSSL 1.1.1
             ssllib: openssl
-            extraconf: "--enable-iproute2"
+            pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin"
+            extraconf: "--enable-iproute2 --enable-pkcs11"
           - os: ubuntu-20.04
             sslpkg: "libssl-dev"
             libname: OpenSSL 1.1.1
@@ -326,11 +329,12 @@  jobs:
     name: "gcc - ${{matrix.os}} - ${{matrix.libname}} ${{matrix.extraconf}}"
     env:
       SSLPKG: "${{matrix.sslpkg}}"
+      PKCS11PKG: "${{matrix.pkcs11pkg}}"
 
     runs-on: ${{matrix.os}}
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG}
+        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG} ${PKCS11PKG}
       - name: Checkout OpenVPN
         uses: actions/checkout@v3
       - name: autoconf