Merge pull request wolfSSL#521 from danielinux/build-keytools-windows

Remove compile-time dependencies from key tools
dgarske · Dec 5, 2024 · 21a4082 · 21a4082
2 parents 06bbed4 + fae36f2
commit 21a4082
Show file tree

Hide file tree

Showing 56 changed files with 574 additions and 631 deletions.
diff --git a/.github/workflows/build-keytools-windows.yml b/.github/workflows/build-keytools-windows.yml
@@ -0,0 +1,38 @@
+name: Build Windows Keytools executables
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build-windows:
+    runs-on: windows-latest
+
+    steps:
+    # Step 1: Checkout the repository
+    - name: Checkout Code
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    # Step 2: Setup MSBuild
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1
+
+    # Step 3: Build the solution
+    - name: Build Solution
+      shell: cmd
+      run: |
+        echo #define WOLFBOOT_SECTOR_SIZE 1024 > include\target.h
+        MSBuild.exe tools\keytools\wolfBootKeyTools.sln /m /p:Configuration=Release /p:Platform="x64"
+
+    # Step 4: Upload executables as artifacts
+    - name: Upload EXE Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: windows-keytools
+        path: |
+          tools\keytools\x64\Release\*.exe
diff --git a/.github/workflows/footprint.yml b/.github/workflows/footprint.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: make clean
         run: |
-          make keysclean && make -C tools/keytools clean && rm -f include/target.h
+          make keysclean && rm -f include/target.h
 
       - name: Install wolfSSL
         run: |
@@ -34,7 +34,7 @@ jobs:
 
       - name: Build key tools
         run: |
-          make -C tools/keytools
+          make keytools
 
       - name: Build wolfboot and test footprint
         run: |

diff --git a/.github/workflows/test-build-sim-tpm.yml b/.github/workflows/test-build-sim-tpm.yml
@@ -44,9 +44,9 @@ jobs:
         with:
           submodules: true
 
-      - name: make distclean
+      - name: make keysclean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |

diff --git a/.github/workflows/test-powerfail-simulator.yml b/.github/workflows/test-powerfail-simulator.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |
@@ -63,16 +63,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE
         run: |
           cp config/examples/sim-nvm-writeonce.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -109,16 +105,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME
         run: |
           cp config/examples/sim-nvm-writeonce-flags-home.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -155,16 +147,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME AND FLAGS_INVERT enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME and FLAGS_INVERT
         run: |
           cp config/examples/sim-nvm-writeonce-flags-home-invert.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-update
@@ -201,16 +189,12 @@ jobs:
       # TEST with DELTA updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with DELTA updates
         run: |
           cp config/examples/sim-delta-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-delta-update
@@ -254,16 +238,12 @@ jobs:
      # TEST with encryption (aes128)
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-update
@@ -299,15 +279,11 @@ jobs:
      # TEST with encryption (aes128) and delta updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-delta-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-delta-update
@@ -336,16 +312,12 @@ jobs:
      # TEST with encryption (aes128) and NVM_FLASH_WRITEONCE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-nvm-writeonce-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-update
@@ -463,15 +435,11 @@ jobs:
      # TEST with encryption (aes128) and NVM_FLASH_WRITEONCE and DELTA updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-delta-nvm-writeonce-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-delta-update
@@ -499,15 +467,11 @@ jobs:
     # TEST with backup disabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled
         run: |
           cp config/examples/sim-nobackup.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -527,15 +491,11 @@ jobs:
     # TEST with backup disabled + NVM_FLASH_WRITEONCE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled + NVM WRITEONCE
         run: |
           cp config/examples/sim-nobackup-nvm-writeonce.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -555,15 +515,11 @@ jobs:
     # TEST with backup disabled + FLAGS_HOME
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled + FLAGS_HOME
         run: |
           cp config/examples/sim-nobackup-flags-home.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -584,16 +540,12 @@ jobs:
     # TEST with FLASH_MULTI_SECTOR_ERASE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |
           cp config/examples/sim.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf (FLASH_MULTI_SECTOR_ERASE=1)
         run: |
           make clean && make test-sim-internal-flash-with-update FLASH_MULTI_SECTOR_ERASE=1

diff --git a/.github/workflows/test-renode-nrf52.yml b/.github/workflows/test-renode-nrf52.yml
@@ -23,12 +23,12 @@ jobs:
 # SIGN=NONE TEST
 
       - name: Renode Tests SIGN=NONE
-        run: ./tools/renode/docker-test.sh "SIGN=NONE"
+        run: ./tools/renode/docker-test.sh "SIGN=NONE V=1"
 
 
 # ECC256 TEST
       - name: Renode Tests ECC256
-        run: ./tools/renode/docker-test.sh "SIGN=ECC256"
+        run: ./tools/renode/docker-test.sh "SIGN=ECC256 V=1"
 
 # ECC384 TEST
       - name: Renode Tests ECC384