Commit b54f9ac6 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

synch with upstream d2122bcc 

Synchronized up to:
https://github.com/mcu-tools/mcuboot/commit/d2122bccc57b8dcb22559ed6b9fac9e63c3070c4



- Added 'revert' support to direct-xip mode.

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents c71d2186 d2122bcc

.github/workflows/imgtool.yaml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
on:

  push:

    branches:

      - master



name: imgtool



jobs:

  environment:

    runs-on: ubuntu-latest

    steps:

    - uses: actions/checkout@v2

      with:

        fetch-depth: 0

    - name: Install packages

      run: |

        export PATH="$HOME/.local/bin:$PATH"

        ./ci/imgtool_install.sh

    - name: Publish

      env:

        TWINE_TOKEN: ${{ secrets.TWINE_TOKEN }}

      run: |

        export PATH="$HOME/.local/bin:$PATH"

        ./ci/imgtool_run.sh

.github/workflows/mynewt.yaml

+8 −2
Original line number Diff line number Diff line 
# For development, trigger this on any push.

on: [pull_request]

on:

  push:

    branches:

      - master

  pull_request:



name: Mynewt



jobs:

  environment:

    name: Mynewt build

    runs-on: ubuntu-latest

    steps:

    - uses: actions/checkout@v2
@@ -16,6 +21,7 @@ jobs: 
        free

        pwd

    - name: Signed commit check

      if: ${{ github.event_name == 'pull_request' }}

      run: |

        ./ci/check-signed-off-by.sh

    - name: Mynewt install

.github/workflows/sim.yaml

+8 −2
Original line number Diff line number Diff line 
# For development, trigger this on any push.

on: [pull_request]

on:

  push:

    branches:

      - master

  pull_request:



name: Sim



jobs:

  environment:
@@ -20,7 +26,6 @@ jobs: 
        - "sig-rsa validate-primary-slot overwrite-only large-write"

        - "sig-ecdsa enc-ec256 validate-primary-slot"

        - "sig-rsa validate-primary-slot overwrite-only downgrade-prevention"

    name: Sim

    runs-on: ubuntu-latest

    env:

      MULTI_FEATURES: ${{ matrix.features }}
@@ -36,6 +41,7 @@ jobs: 
        free

        pwd

    - name: Signed commit check

      if: ${{ github.event_name == 'pull_request' }}

      run: |

        ./ci/check-signed-off-by.sh

    - name: Install stable Rust

.mbedignore

0 → 100644
+19 −0
Original line number Diff line number Diff line 
boot/boot_serial/*

boot/mynewt/*

boot/zephyr/*

boot/cypress/*

ci/*

docs/*

ptest/*

samples/*

scripts/*

sim/*

testplan/*

ext/cddl_gen/*

ext/fiat/*

ext/mbedtls/*

ext/mbedtls-asn1/*

ext/nrf/*

ext/tinycrypt/tests/*

ext/tinycrypt/*

ext/tinycrypt-sha512/*
 
 No newline at end of file

.travis.yml

+49 −48
Original line number Diff line number Diff line 
# Travis configuration.  Build the simulator and run its tests.

# Travis configuration. Run FI hardening tests.



addons:

  apt:

    packages:

      - "python3-pip"

language: minimal



language: rust



cache:

  directories:

    - $HOME/TOOLCHAIN

    - cargo

services:

  - docker



matrix:

  include:

    # Runs each value defined in $SINGLE_FEATURES by itself in the order

    # the were defined.

    # - os: linux

    #   env: SINGLE_FEATURES="sig-ecdsa sig-ed25519 enc-kw bootstrap" TEST=sim

    # - os: linux

    #   env: SINGLE_FEATURES="none sig-rsa sig-rsa3072 overwrite-only validate-primary-slot swap-move" TEST=sim

    # - os: linux

    #   env: SINGLE_FEATURES="enc-rsa enc-ec256 enc-x25519" TEST=sim

    - os: linux

      language: minimal

      env: BUILD_TYPE=RELEASE SKIP_SIZE=2,4,6,8,10 TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    # Values defined in $MULTI_FEATURES consist of any number of features

    # to be enabled at the same time. The list of multi-values should be

    # separated by ',' and each list of values is run sequentially in the

    # defined order.

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa overwrite-only large-write,sig-ecdsa overwrite-only large-write,multiimage overwrite-only large-write" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa validate-primary-slot,sig-ecdsa validate-primary-slot,sig-rsa multiimage validate-primary-slot" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="enc-kw overwrite-only large-write,enc-rsa overwrite-only large-write" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa enc-rsa validate-primary-slot,swap-move enc-rsa sig-rsa validate-primary-slot" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa enc-kw validate-primary-slot bootstrap,sig-ed25519 enc-x25519 validate-primary-slot" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-ecdsa enc-kw validate-primary-slot" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa validate-primary-slot overwrite-only large-write,sig-ecdsa enc-ec256 validate-primary-slot" TEST=sim

    # - os: linux

    #   env: MULTI_FEATURES="sig-rsa validate-primary-slot overwrite-only downgrade-prevention" TEST=sim

    - os: linux

      language: minimal

      env: BUILD_TYPE=RELEASE SKIP_SIZE=2,4,6,8,10 FIH_LEVEL=LOW TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    # - os: linux

    #   language: go

    #   env: TEST=mynewt

    #   go:

    #     - "1.12"

    - os: linux

      language: minimal

      env: BUILD_TYPE=RELEASE SKIP_SIZE=2,4,6,8,10 FIH_LEVEL=MEDIUM TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=2,4,6 TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=2,4,6 FIH_LEVEL=LOW TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=2,4,6 FIH_LEVEL=MEDIUM TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: python

      env: TEST=imgtool

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=8,10 TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=8,10 FIH_LEVEL=LOW TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    - os: linux

      language: minimal

      env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=8,10 FIH_LEVEL=MEDIUM TEST=fih-tests DAMAGE_TYPE=SIGNATURE



    ## Corrupt image hash is not tested as it is in the unprotected TLV section

    ## and is easy to calculate a valid hash for a changed image

    #- os: linux

    #  language: minimal

    #  env: BUILD_TYPE=MINSIZEREL SKIP_SIZE=2,4,6 TEST=fih-tests DAMAGE_TYPE=IMAGE_HASH



    ## Max profile is not tested as it requires HW entropy source which is not

    ## present in the QEMU system being used for the tests.

    #- os: linux

    #  language: minimal

    #  env: FIH_LEVEL=MAX TEST=fih-tests



before_install:

  - |

CRA Git | Maintained and supported by SUSTech CRA and CCSE