Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions .github/workflows/interop-mlkem.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
name: ML-KEM Interop Tests

on:
push:
branches: [ 'master', 'main', 'release/**' ]
pull_request:
branches: [ '*' ]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
openssh: V_10_2_P1
OS_REF: ubuntu-latest
WOLFSSL_REF: v5.9.1-stable
OPENSSH_REF: V_10_2_P1
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we consider updating to V_10_3_P1 which was released in early April?


jobs:
build_wolfssl:
name: Build wolfSSL
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
wolfssl: [v5.8.4-stable, master]
timeout-minutes: 4
Comment thread
ejohnstown marked this conversation as resolved.
steps:
- name: Checking cache for wolfSSL
uses: actions/cache@v5
id: cache-wolfssl
with:
path: build-dir/
key: wolfssh-mlkem-wolfssl-${{ matrix.wolfssl }}
key: wolfssh-mlkem-wolfssl-${{ env.WOLFSSL_REF }}-${{ env.OS_REF }}
lookup-only: true

- name: Checkout, build, and install wolfSSL
if: steps.cache-wolfssl.outputs.cache-hit != 'true'
uses: wolfSSL/actions-build-autotools-project@v1
with:
repository: wolfSSL/wolfssl
ref: ${{ matrix.wolfssl }}
ref: ${{ env.WOLFSSL_REF }}
path: wolfssl
configure: --enable-wolfssh --enable-mlkem --enable-ed25519 --enable-ed25519-stream --enable-curve25519 --enable-base64encode --enable-cryptonly --disable-examples --disable-crypttests
check: false
Expand All @@ -50,15 +53,15 @@ jobs:
id: cache-openssh
with:
path: build-dir/
key: wolfssh-mlkem-openssh-${{ env.openssh }}
key: wolfssh-mlkem-openssh-${{ env.OPENSSH_REF }}
lookup-only: true

- name: Checkout, build, and install wolfSSL
- name: Checkout, build, and install OpenSSH
if: steps.cache-openssh.outputs.cache-hit != 'true'
uses: wolfSSL/actions-build-autotools-project@v1
with:
repository: openssh/openssh-portable
ref: ${{ env.openssh }}
ref: ${{ env.OPENSSH_REF }}
path: openssh
configure: --with-privsep-path=/tmp/empty
check: false
Expand All @@ -70,47 +73,44 @@ jobs:
strategy:
fail-fast: false
matrix:
wolfssl: [v5.8.4-stable, master]
config: [
'',
'--enable-smallstack',
]
runs-on: ubuntu-latest
timeout-minutes: 4
env:
build_dir: ${{ github.workspace }}/build-dir
steps:
- name: Checking cache for wolfSSL
uses: actions/cache@v5
with:
path: build-dir/
key: wolfssh-mlkem-wolfssl-${{ matrix.wolfssl }}
key: wolfssh-mlkem-wolfssl-${{ env.WOLFSSL_REF }}-${{ env.OS_REF }}
fail-on-cache-miss: true

- name: Checking cache for OpenSSH
uses: actions/cache@v5
with:
path: build-dir/
key: wolfssh-mlkem-openssh-${{ env.openssh }}
key: wolfssh-mlkem-openssh-${{ env.OPENSSH_REF }}
fail-on-cache-miss: true

- name: Checkout, build, and test wolfSSH
uses: wolfSSL/actions-build-autotools-project@v1
with:
repository: wolfSSL/wolfssh
path: wolfssh
configure: ${{ matrix.config }} --with-wolfssl=${{ env.build_dir }}
configure: ${{ matrix.config }} --with-wolfssl=${{ github.workspace }}/build-dir
check: true

- name: Make test key
working-directory: ./wolfssh/
run: |
${{ env.build_dir }}/bin/ssh-keygen -f $HOME/.ssh/id_ed25519 -N "" -t ed25519
${{ github.workspace }}/build-dir/bin/ssh-keygen -f $HOME/.ssh/id_ed25519 -N "" -t ed25519
cp $HOME/.ssh/id_ed25519.pub $HOME/.ssh/authorized_keys

- name: Run connect wolfSSH client to OpenSSH server test
working-directory: ./wolfssh/
run: |
mkdir -p /tmp/empty
${{ env.build_dir }}/sbin/sshd -p 22222 -o KbdInteractiveAuthentication=no -o PasswordAuthentication=no -o KexAlgorithms=mlkem768x25519-sha256
${{ github.workspace }}/build-dir/sbin/sshd -p 22222 -o KbdInteractiveAuthentication=no -o PasswordAuthentication=no -o KexAlgorithms=mlkem768x25519-sha256
./examples/client/client -u $USER -i $HOME/.ssh/id_ed25519 -j $HOME/.ssh/id_ed25519.pub -c "ls /"
97 changes: 0 additions & 97 deletions .github/workflows/kyber.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/singlethread-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
cancel-in-progress: true

env:
WOLFSSL_REF: v5.7.0-stable
WOLFSSL_REF: v5.9.1-stable

jobs:
build_wolfssl:
Expand Down
Loading