Skip to content

Commit f72f4cf

Browse files
author
Arto Kinnunen
committed
Merge commit '7f481413da309daf1f39908cc5fc1a90dab18c68' into nanostack_release_14_0_0_to_5_15
* commit '7f481413da309daf1f39908cc5fc1a90dab18c68': Squashed 'features/frameworks/mbed-client-randlib/' changes from cf3936f074..4870f0da56
2 parents a164658 + 7f48141 commit f72f4cf

File tree

9 files changed

+27
-24
lines changed

9 files changed

+27
-24
lines changed

features/frameworks/mbed-client-randlib/mbed-client-randlib/platform/arm_hal_random.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

features/frameworks/mbed-client-randlib/mbed-client-randlib/randLIB.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

features/frameworks/mbed-client-randlib/source/randLIB.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, 2018, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2015-2016, 2018, 2021, Pelion and affiliates.
33
*/
44

55
#include "CppUTest/CommandLineTestRunner.h"

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/randlibtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016, 2018, 2021, Pelion and affiliates.
33
*/
44
#include "CppUTest/TestHarness.h"
55
#include "test_randlib.h"

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016, 2018, 2021, Pelion and affiliates.
33
*/
44
#include "test_randlib.h"
55
#include <string.h>

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016, 2021, Pelion and affiliates.
33
*/
44
#ifndef TEST_RANDLIB_H
55
#define TEST_RANDLIB_H

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/open_stub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016, 2018, 2021, Pelion and affiliates.
33
*/
44
#include <stdbool.h>
55
#include <sys/types.h>

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/stubs/random_stub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016, 2018, 2021, Pelion and affiliates.
33
*/
44

55
#include "ns_types.h"

0 commit comments

Comments
 (0)