Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
required: true

jobs:
generate-sbom-and-tag-commit:
tag-commit:
name: Tag commit
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions lexicon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ md
microcontrollers
min
misra
mit
msb
multibyte
nb
Expand Down Expand Up @@ -106,6 +107,7 @@ skipspace
skipspaceandcomma
skipstring
skiputf
spdx
stderr
struct
sublicense
Expand Down
2 changes: 2 additions & 0 deletions source/core_json.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions source/include/core_json.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/include/core_json_annex.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/include/skipGeneric.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/JSON_Search/JSON_Search_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipCollection/skipCollection_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipEscape/skipEscape_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipNumber/skipNumber_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipSpace/skipSpace_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipString/skipString_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/proofs/skipUTF8/skipUTF8_harness.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipAnyLiteral.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipAnyScalar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipCollection.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipDigits.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipEscape.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipGeneric.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipNumber.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipSpace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipSpaceAndComma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipString.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/cbmc/stubs/skipUTF8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/unit-test/catch_assert.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/unit-test/core_json_utest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down