Merge pull request #2 from ARMmbed/master

Sync to latest mbed-os

Author: juliensu

.mergify.yml

@@ -39,6 +39,7 @@ pull_request_rules:
     conditions:
       # Travis failing
       - status-failure~=continuous-integration/travis-ci/pr
+      - "label!=mergify skip"
     actions:
       label:
         add: ['needs: work']
@@ -49,6 +50,7 @@ pull_request_rules:
     conditions:
       # Jenkins CI failing
       - status-failure~=continuous-integration/jenkins/pr-head
+      - "label!=mergify skip"
     actions:
       label:
         add: ['needs: work']
@@ -59,6 +61,7 @@ pull_request_rules:
     conditions:
       # Jenkins CI failing - any of the pipeline
       - status-failure~=^jenkins-ci
+      - "label!=mergify skip"
     actions:
       label:
         add: ['needs: work']
@@ -74,6 +77,9 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - "#approved-reviews-by>=1"
 
+      # No conflict with the base branch
+      - -conflict
+
       # CI green policy, at least Travis should be green
       - status-success~=continuous-integration/travis-ci/pr
       # new CI needs to be done (neutral does not work, lets check if it failed or passed, if none, we need to run again)
@@ -117,6 +123,7 @@ pull_request_rules:
     conditions:
       # Labels
       - "label!=do not merge"
+      - "label!=mergify skip"
       - "label=needs: CI"
 
       # Reviewers

.travis.yml

@@ -55,10 +55,41 @@ matrix:
     - <<: *basic-vm
       name: "license check"
       env: NAME=licence_check
+      language: python
+      python: 3.6.8 # scancode-toolkit v3.1.1 requires v3.6.8
+      install:
+        - pip install scancode-toolkit==3.1.1
+      before_script:
+        - mkdir -p SCANCODE
+        # Fetch remaining information needed for branch comparison
+        - git fetch --all --unshallow --tags
+        - git fetch origin "${TRAVIS_BRANCH}"
       script:
+        # scancode does not support list of files, only one file or directory
+        # we use SCANCODE directory for all changed files (their copies with full tree)
+        - >-
+            git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
+              | ( grep '.\(c\|cpp\|h\|hpp\|py\)$' || true ) \
+              | ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
+              | while read file; do cp --parents "${file}" SCANCODE; done
+        - scancode -l --json-pp scancode.json SCANCODE
+        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json || true
+      after_success:
+        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json
+        - cat scancode-evaluate.log
+        - COUNT=$(cat scancode-evaluate.log | grep 'File:' | wc -l)
         - |
-          ! grep --recursive --max-count=100 --ignore-case --exclude .travis.yml \
-          "gnu general\|gnu lesser\|lesser general\|public license"
+          if [ $COUNT == 0 ]; then
+              echo "License check OK";
+              STATUSM="All licenses OK";
+              set_status "success" "$STATUSM";
+            else
+              echo "License check failed, please review license issues found";
+              STATUSM="Needs review, ${COUNT} license issues found";
+              set_status "success" "$STATUSM";
+          fi
+
+
 
     - <<: *basic-vm
       name: "include check"

TESTS/configs/baremetal.json

@@ -32,7 +32,8 @@
         "events",
         "kv-global-api",
         "sd",
-        "qspif"
+        "qspif",
+        "cryptocell310"
     ],
     "target_overrides": {
         "*": {

TESTS/events/queue/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/events/timing/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/host_tests/crash_reporting.py

@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/device_echo.py

@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2011-2016 ARM Limited
+Copyright (c) 2011-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/rtc_calc_auto.py

@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2011-2013 ARM Limited
+Copyright (c) 2011-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/rtc_reset.py

@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2017-2017 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/system_reset.py

@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/timing_drift_auto.py

@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/host_tests/trng_reset.py

@@ -1,10 +1,12 @@
 """
-Copyright (c) 2018 ARM Limited
+Copyright (c) 2018-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

TESTS/host_tests/usb_device_hid.py

@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

TESTS/integration/COMMON/download_test.cpp

@@ -84,10 +84,17 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
     TEST_ASSERT_MESSAGE((MAX_THREADS * RECV_BUF_SIZE) >= buff_size, "Cannot test with the requested buffer size");
 
     /* setup TCP socket */
-    TCPSocket tcpsocket(interface);
+    TCPSocket tcpsocket;
+    SocketAddress tcp_addr;
+
+    interface->gethostbyname(dl_host, &tcp_addr);
+    tcp_addr.set_port(80);
+
+    nsapi_error_t err = tcpsocket.open(interface);
+    TEST_ASSERT_EQUAL_INT_MESSAGE(NSAPI_ERROR_OK, err, "unable to open socket");
 
     for (int tries = 0; tries < MAX_RETRIES; tries++) {
-        result = tcpsocket.connect(dl_host, 80);
+        result = tcpsocket.connect(tcp_addr);
         TEST_ASSERT_MESSAGE(result != NSAPI_ERROR_NO_SOCKET, "out of sockets");
 
         if (result == 0) {

TESTS/lorawan/loraradio/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed-crypto/sanity/main.cpp

@@ -262,13 +262,13 @@ void test_crypto_asymmetric_sign_verify(void)
     psa_set_key_algorithm(&attributes, alg);
     psa_set_key_type(&attributes, key_type);
     TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_import_key(&attributes, key, sizeof(key), &key_handle));
-    TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_sign(key_handle, alg, input, sizeof(input),
-                                                       signature, sizeof(signature), &signature_len));
+    TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_sign_hash(key_handle, alg, input, sizeof(input),
+                                                 signature, sizeof(signature), &signature_len));
     TEST_ASSERT_EQUAL(sizeof(signature), signature_len);
     TEST_ASSERT_EQUAL_HEX8_ARRAY(expected_signature, signature, signature_len);
 
-    TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_asymmetric_verify(key_handle, alg, input, sizeof(input),
-                                                         signature, signature_len));
+    TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_verify_hash(key_handle, alg, input, sizeof(input),
+                                                   signature, signature_len));
     TEST_ASSERT_EQUAL(PSA_SUCCESS, psa_destroy_key(key_handle));
 }
 

TESTS/mbed_drivers/crc/main.cpp

@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/dev_null/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2014 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/flashiap/main.cpp

@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/lp_ticker/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/lp_timeout/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/sleep_lock/main.cpp

@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/ticker/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/timeout/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/timeout/timeout_tests.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_drivers/timerevent/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_functional/callback/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_functional/callback_big/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_functional/callback_small/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/common_tickers/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/common_tickers/ticker_api_tests.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/crc/crc_api_tests.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/crc/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/critical_section/critical_section_test.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/critical_section/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/lp_ticker/lp_ticker_api_tests.h

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/lp_ticker/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

TESTS/mbed_hal/minimum_requirements/main.cpp

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.