updates to squash later

Author: ejohnstown

.github/workflows/interop-mlkem.yml

@@ -12,21 +12,20 @@ concurrency:
 
 env:
   wolfssl: v5.8.4-stable
-  os: ubuntu-latest
-  cache_key: wolfssh-mlkem-wolfssl-${{ env.wolfssl }}-${{ env.os }}
+  openssh: V_10_2_P1
 
 jobs:
   build_wolfssl:
-    name: Build wolfssl
-    runs-on: ${{ env.os }}
+    name: Build wolfSSL
+    runs-on: ubuntu-latest
     timeout-minutes: 4
     steps:
       - name: Checking cache for wolfSSL
         uses: actions/cache@v4
         id: cache-wolfssl
         with:
           path: build-dir/
-          key: ${{ env.cache_key }}
+          key: wolfssh-mlkem-wolfssl-${{ env.wolfssl }}b
           lookup-only: true
 
       - name: Checkout, build, and install wolfSSL
@@ -36,27 +35,68 @@ jobs:
           repository: wolfSSL/wolfssl
           ref: ${{ env.wolfssl }}
           path: wolfssl
-          configure: --enable-wolfssh --enable-mlkem --enable-curve25519 --enable-base64encode --enable-cryptonly --disable-examples --disable-crypttests
+          configure: --enable-wolfssh --enable-mlkem --enable-ed25519 --enable-ed25519-stream --enable-curve25519 --enable-base64encode --enable-cryptonly --disable-examples --disable-crypttests
+          check: false
+          install: true
+
+  build_openssh:
+    runs-on: ubuntu-latest
+    timeout-minutes: 4
+    steps:
+      - name: Checking cache for OpenSSH
+        uses: actions/cache@v4
+        id: cache-openssh
+        with:
+          path: build-dir/
+          key: wolfssh-mlkem-openssh-${{ env.openssh }}
+          lookup-only: true
+
+      - name: Checkout, build, and install wolfSSL
+        if: steps.cache-openssh.outputs.cache-hit != 'true'
+        uses: wolfSSL/actions-build-autotools-project@v1
+        with:
+          repository: openssh/openssh-portable
+          ref: ${{ env.openssh }}
+          path: openssh
+          configure:
           check: false
           install: true
 
   build_wolfssh:
-    name: Build wolfssh
-    runs-on: ${{ env.os }}
+    name: Build wolfSSH
+    runs-on: ubuntu-latest
     timeout-minutes: 4
-    needs: [build_wolfssl]
+    needs: [build_wolfssl, build_openssh]
+    env:
+      build_dir: ${{ github.workspace }}/build-dir
     steps:
       - name: Checking cache for wolfSSL
         uses: actions/cache@v4
         with:
           path: build-dir/
-          key: wolfssh-mlkem-wolfssl-${{ env.wolfssl }}-${{ env.os }}
+          key: wolfssh-mlkem-wolfssl-${{ env.wolfssl }}b
+          fail-on-cache-miss: true
+
+      - name: Checking cache for OpenSSH
+        uses: actions/cache@v4
+        with:
+          path: build-dir/
+          key: wolfssh-mlkem-openssh-${{ env.openssh }}
           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: --with-wolfssl=${{ github.workspace }}/build-dir
+          configure: --enable-debug --with-wolfssl=${{ env.build_dir }}
           check: true
+
+      - name: Run connect test
+        working-directory: ./wolfssh/
+        run: |
+          mkdir -p /var/empty
+          ${{ env.build_dir }}/bin/ssh-keygen -f ~/.ssh/id_ed25519 -N "" -t ed25519
+          cp ~/.ssh/id_ed25519.pub ~/.ssh/authorized_keys
+          ${{ env.build_dir }}/sbin/sshd -p 22222 -o KbdInteractiveAuthentication=no -o PasswordAuthentication=no -o KexAlgorithms=mlkem768x25519-sha256
+          ./examples/client/client -u root -i ~/.ssh/id_ed25519 -j ~/.ssh/id_ed25519.pub -c "ls /"