Merge branch 'security-manager-dev' of https://github.com/paul-szczepanek-arm/mbed-os into fix-encryption-rejection

Author: pan-

.astyleignore

@@ -0,0 +1,17 @@
+BUILD
+cmsis
+features/mbedtls
+features/FEATURE_LWIP/lwip
+rtos/TARGET_CORTEX/rtx4
+features/filesystem/littlefs/littlefs
+features/filesystem/fat/ChaN
+features/frameworks
+features/FEATURE_BLE/targets
+features/FEATURE_LWIP/lwip-interface/lwip
+features/unsupported/
+features/FEATURE_COMMON_PAL/
+FEATURE_NANOSTACK/coap-service
+FEATURE_NANOSTACK/sal-stack-nanostack
+rtos/TARGET_CORTEX/rtx5
+targets
+tools

.astylerc

@@ -0,0 +1,34 @@
+# Mbed OS code style definition file for astyle
+
+# Don't create backup files, let git handle it
+suffix=none
+
+# K&R style
+style=kr
+
+# 1 TBS addition to k&r, add braces to one liners
+# Use -j as it was changed in astyle from brackets to braces, this way it is compatible with older astyle versions
+-j
+
+# 4 spaces, convert tabs to spaces
+indent=spaces=4
+convert-tabs
+
+# Indent switches and cases
+indent-switches
+indent-cases
+
+# Remove spaces in and around parentheses
+unpad-paren
+
+# Insert a space after if, while, for, and around operators
+pad-header
+pad-oper
+
+# Pointer/reference operators go next to the name (on the right)
+align-pointer=name
+align-reference=name
+
+# Attach { for classes and namespaces
+attach-namespaces
+attach-classes

.github/issue_template.md

@@ -1,48 +1,31 @@
-Note: This is just a template, so feel free to use/remove the unnecessary things
-
 ### Description
-- Type: Bug | Enhancement | Question
-- Related issue: `#abc`
-- Priority: Blocker | Major | Minor
-
----------------------------------------------------------------
-## Bug
-
-**Target**
-K64F|??
-
-**Toolchain:**
-GCC_ARM|ARM|IAR
-
-**Toolchain version:**
-
-**mbed-cli version:** 
-(`mbed --version`)
-
-**mbed-os sha:**
-(`git log -n1 --oneline`)
-
-**DAPLink version:**
-
-**Expected behavior**
-
-**Actual behavior**
-
-**Steps to reproduce**
-
-----------------------------------------------------------------
-## Enhancement
-
-**Reason to enhance or problem with existing solution**
-
-**Suggested enhancement**
-
-**Pros**
-
-**Cons**
-
------------------------------------------------------------------
-
-## Question
+<!-- 
+    Required
+    Add detailed description of what you are reporting.
+    Good example: https://os.mbed.com/docs/latest/reference/workflow.html
+    Things to consider sharing:
+    - What target does this relate to?
+    - What toolchain (name + version) are you using?
+    - What tools (name + version - is it mbed-cli, online compiler or IDE) are you using?
+    - What is the SHA of Mbed OS (git log -n1 --oneline)?
+    - Steps to reproduce. (Did you publish code or a test case that exhibits the problem?)
+-->
+
+
+### Issue request type
+<!-- 
+    Required
+    Please add only one X to one of the following types. Do not fill multiple types. (Split the issue otherwise.)
+    Please note this is not a GitHub task list; indenting the boxes or changing the format to add a '.' or '*' in front
+    of them changes the meaning incorrectly. The only changes to make are to add a description under the
+    description heading and to add an 'x' to the correct box.
+
+    [X] Question
+    [ ] Enhancement 
+    [ ] Bug 
+-->
+
+[ ] Question  
+[ ] Enhancement  
+[ ] Bug  
 
-**How to?**

.github/pull_request_template.md

@@ -3,19 +3,22 @@
 <!-- 
     Required
     Add here detailed changes summary, testing results, dependencies 
-    Good example: https://os.mbed.com/docs/latest/reference/guidelines.html#workflow (Pull request template)
+    Good example: https://os.mbed.com/docs/latest/reference/workflow.html (Pull request template)
 -->
 
 
 ### Pull request type
 
 <!-- 
     Required
-    Please tick one of the following types 
+    Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise).
+    Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
+    of them would change the meaning incorrectly. The only changes to be made are to add a description text under the
+    description heading and to add a 'x' to the correct box.
 -->
+    [ ] Fix
+    [ ] Refactor
+    [ ] New target
+    [ ] Feature
+    [ ] Breaking change
 
-- [ ] Fix
-- [ ] Refactor
-- [ ] New target
-- [ ] Feature
-- [ ] Breaking change

.travis.yml

@@ -31,7 +31,7 @@ before_install:
   # Setup ppa to make sure arm-none-eabi-gcc is correct version
   - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
   # Loop until update succeeds (timeouts can occur)
-  - while [ -n "$(sudo apt-get update 2>&1 |grep Failed)" ]; do :; done
+  - travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
 
 after_success:
   - bash -c "$STATUS" success "Local $NAME testing has passed"
@@ -94,6 +94,45 @@ matrix:
         # Report success since we have overridden default behaviour
         - bash -c "$STATUS" success "Local $NAME testing has passed"
 
+    - env:
+        - NAME=astyle
+      install:
+      - wget https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1/astyle_3.1_linux.tar.gz;
+        mkdir -p BUILD && tar xf astyle_3.1_linux.tar.gz -C BUILD;
+        pushd BUILD/astyle/build/gcc;
+        make;
+        export PATH=$PWD/bin:$PATH;
+        popd;
+      - astyle --version
+      script:
+        # only changed files this time
+        - git diff --name-only $TRAVIS_BRANCH | grep '.*\.\(h\|c\|hpp\|cpp\)' | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-files-changed.out;
+          if [ $(cat astyle-files-changed.out | grep Formatted | wc -l) -ne 0 ]; then
+            git --no-pager diff;
+            echo "Please fix style issues as shown above";
+          else
+            echo "Coding style check OK";
+          fi
+      after_success:
+        # run astyle for all files on the branch
+        - git checkout -- .
+        - find -regex '.*\.\(h\|c\|hpp\|cpp\)' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
+        # update status if we succeeded, compare with master if possible
+        - |
+          CURR=$(cat astyle-branch.out | grep Formatted | wc -l)
+          PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
+                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
+                  | capture(\", (?<warnings>[0-9]+) warnings\").warnings" \
+              || echo 0)
+
+          STATUSM="Passed, ${CURR} warnings"
+          if [ "$PREV" -ne 0 ]
+          then
+              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") warnings)"
+          fi
+        - bash -c "$STATUS" success "$STATUSM"
+
     - env:
         - NAME=events
         - EVENTS=events
@@ -111,10 +150,28 @@ matrix:
         - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
-        - rm -r rtos features/cellular features/netsocket features/frameworks BUILD
+        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
         - make -C $EVENTS/equeue test
+        # Run profiling tests
+        - make -C $EVENTS/equeue prof | tee prof
+      after_success:
+        # update status if we succeeded, compare with master if possible
+        - |
+          CURR=$(grep -o '[0-9]\+ cycles' prof | awk '{sum += $1} END {print sum}')
+          PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
+                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
+                  | capture(\"runtime is (?<runtime>[0-9]+)\").runtime" \
+              || echo 0)
+
+          STATUSM="Passed, runtime is ${CURR} cycles"
+          if [ "$PREV" -ne 0 ]
+          then
+              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") cycles)"
+          fi
+        - bash -c "$STATUS" success "$STATUSM"
 
     - env:
         - NAME=littlefs
@@ -175,7 +232,7 @@ matrix:
         # update status if we succeeded, compare with master if possible
         - |
           CURR=$(tail -n1 sizes | awk '{print $1}')
-          PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+          PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
               | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
                   | .statuses[] | select(.context == \"travis-ci/$NAME\").description
                   | capture(\"code size is (?<size>[0-9]+)\").size" \
@@ -188,36 +245,8 @@ matrix:
           fi
         - bash -c "$STATUS" success "$STATUSM"
 
-    - &mbed-2
-      env: NAME=mbed2-NXP
-      install:
-        # Install dependencies
-        - export GCC_DIR=$HOME/gcc-arm-none-eabi-6-2017-q2-update
-        - export GCC_ARCHIVE=$HOME/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-        - export GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2?revision=2cc92fb5-3e0e-402d-9197-bdfc8224d8a5?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,6-2017-q2-update
-        - if [ ! -e $GCC_DIR/bin/arm-none-eabi-gcc ]; then wget $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi
-        - export PATH=$PATH:$GCC_DIR/bin
-        - pip install -r requirements.txt
-        # Print versions we use
-        - arm-none-eabi-gcc --version
-        - python --version
-      before_script:
-        # Create BUILD directory for tests
-        - mkdir BUILD
+    - env:
+        - NAME=gitattributestest
       script:
-        # Run local mbed 2 testing
-        - python -u tools/build_travis.py --vendor "${NAME#mbed2-}"
-    - <<: *mbed-2
-      env: NAME=mbed2-STM
-    - <<: *mbed-2
-      env: NAME=mbed2-NORDIC
-    - <<: *mbed-2
-      env: NAME=mbed2-SILICON_LABS
-    - <<: *mbed-2
-      env: NAME=mbed2-MAXIM
-    - <<: *mbed-2
-      env: NAME=mbed2-ATMEL
-    - <<: *mbed-2
-      env: NAME=mbed2-NUVOTON
-    - <<: *mbed-2
-      env: NAME=mbed2-RENESAS
+        # Check that no changes after clone. This check that .gitattributes is used right way.
+        - git diff --exit-code

TESTS/host_tests/device_echo.py

@@ -0,0 +1,32 @@
+"""
+mbed SDK
+Copyright (c) 2011-2016 ARM Limited
+
+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
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
+import uuid
+from mbed_host_tests import BaseHostTest
+
+class Device_Echo(BaseHostTest):
+
+    def _callback_repeat(self, key, value, _):
+        self.send_kv(key, value)
+
+    def setup(self):
+        self.register_callback("echo", self._callback_repeat)
+        self.register_callback("echo_count", self._callback_repeat)
+
+    def teardown(self):
+        pass