Merge commit '7556e925c6a7ff2866ef48e1274548ee8f53c0ac' into nanostack_release_14_0_0_to_5_15

Arto Kinnunen · Arto Kinnunen · commit 7d8598ff8cec · 2021-06-28T09:57:52.000+03:00
* commit '7556e925c6a7ff2866ef48e1274548ee8f53c0ac': Squashed 'features/nanostack/coap-service/' changes from 4a126bd..bbe0173
diff --git a/features/nanostack/coap-service/Makefile b/features/nanostack/coap-service/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/Makefile.test b/features/nanostack/coap-service/Makefile.test
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/coap-service/coap_service_api.h b/features/nanostack/coap-service/coap-service/coap_service_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/run_unit_tests.sh b/features/nanostack/coap-service/run_unit_tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/coap_connection_handler.c b/features/nanostack/coap-service/source/coap_connection_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/coap_message_handler.c b/features/nanostack/coap-service/source/coap_message_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/coap_security_handler.c b/features/nanostack/coap-service/source/coap_security_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/coap_service_api.c b/features/nanostack/coap-service/source/coap_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/include/coap_connection_handler.h b/features/nanostack/coap-service/source/include/coap_connection_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/include/coap_message_handler.h b/features/nanostack/coap-service/source/include/coap_message_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/include/coap_security_handler.h b/features/nanostack/coap-service/source/include/coap_security_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, 2021, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/source/include/coap_service_api_internal.h b/features/nanostack/coap-service/source/include/coap_service_api_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk b/features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt b/features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/run_tests b/features/nanostack/coap-service/test/coap-service/unittest/run_tests
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2015-2017, Arm Limited and affiliates.
+# Copyright (c) 2015-2017, Pelion and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Arm Limited and affiliates.
+ * Copyright (c) 2016-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, 2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+#include <string.h> // memset
 #include "mbedtls_stub.h"
 
 mbedtls_stub_def mbedtls_stub;
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, 2019-2020, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * Copyright (c) 2014-2018, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017, Arm Limited and affiliates.
+ * Copyright (c) 2011-2019, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Arm Limited and affiliates.
+ * Copyright (c) 2015-2017, Pelion and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
diff --git a/features/nanostack/coap-service/xsl_script.sh b/features/nanostack/coap-service/xsl_script.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2015-2017, Arm Limited and affiliates.`
	`1`	`+# Copyright (c) 2015-2017, Pelion and affiliates.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`	`#`
`4`	`4`	`# Licensed under the Apache License, Version 2.0 (the "License");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015-2017, Arm Limited and affiliates.`
	`2`	`+ * Copyright (c) 2015-2018, 2020, Pelion and affiliates.`
`3`	`3`	`* SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2015-2017, Arm Limited and affiliates.`
	`3`	`+# Copyright (c) 2015-2017, Pelion and affiliates.`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`	`# Licensed under the Apache License, Version 2.0 (the "License");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015-2019, Arm Limited and affiliates.`
	`2`	`+ * Copyright (c) 2015-2019, Pelion and affiliates.`
`3`	`3`	`* SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`