diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4aa42ca0..131ef47b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ on: required: true jobs: - generate-sbom-and-tag-commit: + tag-commit: name: Tag commit runs-on: ubuntu-latest steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 130862ce..b3c2c785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for coreJSON Library -## v3.2.0 (September 2022) +## v3.2.0 (October 2022) - [#121](https://github.com/FreeRTOS/coreJSON/pull/121) MISRA C:2012 compliance updates. - [#119](https://github.com/FreeRTOS/coreJSON/pull/119) Update CBMC Starter Kit. - [#115](https://github.com/FreeRTOS/coreJSON/pull/115) Fix JSON validation for mismatched brackets. diff --git a/README.md b/README.md index 6d0ebaba..b299c764 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ This library has gone through code quality checks including verification that no See memory requirements for this library [here](./docs/doxygen/include/size_table.md). +**coreJSON v3.2.0 [source code](https://github.com/FreeRTOS/coreJSON/tree/v3.2.0/source) is part of the [FreeRTOS 202210.00 LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202210.00-LTS) release.** + **coreJSON v3.0.0 [source code](https://github.com/FreeRTOS/coreJSON/tree/v3.0.0/source) is part of the [FreeRTOS 202012.00 LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202012.00-LTS) release.** ## Reference example diff --git a/lexicon.txt b/lexicon.txt index 185a9b0b..e14eace8 100644 --- a/lexicon.txt +++ b/lexicon.txt @@ -70,6 +70,7 @@ md microcontrollers min misra +mit msb multibyte nb @@ -106,6 +107,7 @@ skipspace skipspaceandcomma skipstring skiputf +spdx stderr struct sublicense diff --git a/source/core_json.c b/source/core_json.c index f13d5df6..06a0cb4c 100644 --- a/source/core_json.c +++ b/source/core_json.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/source/include/core_json.h b/source/include/core_json.h index 2be18306..102a24f6 100644 --- a/source/include/core_json.h +++ b/source/include/core_json.h @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/include/core_json_annex.h b/test/cbmc/include/core_json_annex.h index fb3a04d1..c0d880c3 100644 --- a/test/cbmc/include/core_json_annex.h +++ b/test/cbmc/include/core_json_annex.h @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/include/skipGeneric.h b/test/cbmc/include/skipGeneric.h index d72c1635..597df001 100644 --- a/test/cbmc/include/skipGeneric.h +++ b/test/cbmc/include/skipGeneric.h @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c b/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c index 12eeae96..ae1f440f 100644 --- a/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c +++ b/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c b/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c index d2b613ff..7eceb849 100644 --- a/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c +++ b/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c b/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c index 88cdc99a..fcbe41e8 100644 --- a/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c +++ b/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c b/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c index 3d5ede4a..02f50048 100644 --- a/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c +++ b/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipCollection/skipCollection_harness.c b/test/cbmc/proofs/skipCollection/skipCollection_harness.c index ba50fe93..f0066114 100644 --- a/test/cbmc/proofs/skipCollection/skipCollection_harness.c +++ b/test/cbmc/proofs/skipCollection/skipCollection_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipEscape/skipEscape_harness.c b/test/cbmc/proofs/skipEscape/skipEscape_harness.c index 8633f6a0..8297dc9a 100644 --- a/test/cbmc/proofs/skipEscape/skipEscape_harness.c +++ b/test/cbmc/proofs/skipEscape/skipEscape_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipNumber/skipNumber_harness.c b/test/cbmc/proofs/skipNumber/skipNumber_harness.c index fb687d7d..b55effe5 100644 --- a/test/cbmc/proofs/skipNumber/skipNumber_harness.c +++ b/test/cbmc/proofs/skipNumber/skipNumber_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipSpace/skipSpace_harness.c b/test/cbmc/proofs/skipSpace/skipSpace_harness.c index 13a73a50..6a48e8d4 100644 --- a/test/cbmc/proofs/skipSpace/skipSpace_harness.c +++ b/test/cbmc/proofs/skipSpace/skipSpace_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c b/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c index 0139f3c0..3319c349 100644 --- a/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c +++ b/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipString/skipString_harness.c b/test/cbmc/proofs/skipString/skipString_harness.c index e9d02fa0..7cbc0ea2 100644 --- a/test/cbmc/proofs/skipString/skipString_harness.c +++ b/test/cbmc/proofs/skipString/skipString_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c b/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c index 2038f73a..a111ba05 100644 --- a/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c +++ b/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipAnyLiteral.c b/test/cbmc/stubs/skipAnyLiteral.c index 53525d8e..8452498e 100644 --- a/test/cbmc/stubs/skipAnyLiteral.c +++ b/test/cbmc/stubs/skipAnyLiteral.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipAnyScalar.c b/test/cbmc/stubs/skipAnyScalar.c index 31277755..22b90205 100644 --- a/test/cbmc/stubs/skipAnyScalar.c +++ b/test/cbmc/stubs/skipAnyScalar.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipCollection.c b/test/cbmc/stubs/skipCollection.c index b31c4bac..8a7da6d2 100644 --- a/test/cbmc/stubs/skipCollection.c +++ b/test/cbmc/stubs/skipCollection.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipDigits.c b/test/cbmc/stubs/skipDigits.c index 333d3958..89e41277 100644 --- a/test/cbmc/stubs/skipDigits.c +++ b/test/cbmc/stubs/skipDigits.c @@ -2,6 +2,8 @@ * coreJSON v1.0.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipEscape.c b/test/cbmc/stubs/skipEscape.c index 4075572d..cd30fc1d 100644 --- a/test/cbmc/stubs/skipEscape.c +++ b/test/cbmc/stubs/skipEscape.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipGeneric.c b/test/cbmc/stubs/skipGeneric.c index 4838e288..bdcb6b0e 100644 --- a/test/cbmc/stubs/skipGeneric.c +++ b/test/cbmc/stubs/skipGeneric.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipNumber.c b/test/cbmc/stubs/skipNumber.c index da8f4465..fd0189c9 100644 --- a/test/cbmc/stubs/skipNumber.c +++ b/test/cbmc/stubs/skipNumber.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipSpace.c b/test/cbmc/stubs/skipSpace.c index f41200ee..383f7754 100644 --- a/test/cbmc/stubs/skipSpace.c +++ b/test/cbmc/stubs/skipSpace.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipSpaceAndComma.c b/test/cbmc/stubs/skipSpaceAndComma.c index 3d44f66e..d8eb22ea 100644 --- a/test/cbmc/stubs/skipSpaceAndComma.c +++ b/test/cbmc/stubs/skipSpaceAndComma.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipString.c b/test/cbmc/stubs/skipString.c index 600887bc..f83c3191 100644 --- a/test/cbmc/stubs/skipString.c +++ b/test/cbmc/stubs/skipString.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/cbmc/stubs/skipUTF8.c b/test/cbmc/stubs/skipUTF8.c index 4772378c..b0c6fe66 100644 --- a/test/cbmc/stubs/skipUTF8.c +++ b/test/cbmc/stubs/skipUTF8.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/unit-test/catch_assert.h b/test/unit-test/catch_assert.h index bce842fe..f71451a6 100644 --- a/test/unit-test/catch_assert.h +++ b/test/unit-test/catch_assert.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to diff --git a/test/unit-test/core_json_utest.c b/test/unit-test/core_json_utest.c index e6bc6d21..b0f9c6d4 100644 --- a/test/unit-test/core_json_utest.c +++ b/test/unit-test/core_json_utest.c @@ -2,6 +2,8 @@ * coreJSON v3.2.0 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * SPDX-License-Identifier: MIT + * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to