Merge remote-tracking branch 'origin/master' into feature/mbedtls

diff --cc .gitlab-ci.yml
index c222ca2fd2d25ac572498eb4927527f2979ae56a,96006f8c8cd04d708d9c75a7ca96e53c2cf4b767..e7b240a4f820fbe55850d06a689e3f56babc4878
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -23,8 -37,37 +37,37 @@@ build_template_app
      # branch
      - git checkout ${CI_BUILD_REF_NAME} || echo "Using esp-idf-template default branch..."
      - make defconfig
 -    - make all
 +    - make all V=1
  
+ 
+ .build_gitlab: &build_template
+   stage: build
+   tags:
+     - build
+   image: espressif/esp32-ci-env
+ 
+   variables:
+     SDK_PATH: "$CI_PROJECT_DIR"
+     IDF_PATH: "$CI_PROJECT_DIR"
+     GIT_STRATEGY: clone
+ 
+ build_ssc:
+   <<: *build_template
+   artifacts:
+     paths:
+       - ./SSC/build/*.bin
+       - ./SSC/build/*.elf
+       - ./SSC/build/*.map
+       - ./SSC/build/bootloader/*.bin
+     expire_in: 6 mos
+ 
+   script:
+     - git clone ssh://git@gitlab.espressif.cn:27227/yinling/SSC.git
+     - cd SSC
+     - make defconfig
+     - chmod +x gen_misc_ng.sh
+     - ./gen_misc_ng.sh
+ 
  test_nvs_on_host:
    stage: test
    image: espressif/esp32-ci-env

diff --cc components/bootloader/Makefile.projbuild
Simple merge

diff --cc components/esp32/include/rom/aes.h
Simple merge

diff --cc components/esp32/include/rom/bigint.h
Simple merge