Missing text in LICENSE file (no change to license terms)
The last two lines of the BSD license omitted by accident are put back.
All the license text is removed from the README in favor of the LICENSE file.
Co-authored-by: Laurence Lundblade <lgl@securitytheory.com>
diff --git a/LICENSE b/LICENSE
index bf7753f..6dc0157 100644
--- a/LICENSE
+++ b/LICENSE
@@ -33,4 +33,5 @@
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 708a3a6..b4d777f 100644
--- a/README.md
+++ b/README.md
@@ -538,42 +538,6 @@
* Máté Tóth-Pál for float-point disabling and other
* Dave Thaler for portability to Windows
-## Copyright and License
-
-QCBOR is available under what is essentially the 3-Clause BSD License.
-
-Files created inside Qualcomm and open-sourced through CAF (The Code
-Aurora Forum) have a slightly modified 3-Clause BSD License. The
-modification additionally disclaims NON-INFRINGEMENT.
-
-Files created after release to CAF use the standard 3-Clause BSD
-License with no modification. These files have the SPDX license
-identifier, "SPDX-License-Identifier: BSD-3-Clause" in them.
-
-### BSD-3-Clause license
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### Copyright for this README
diff --git a/cmd_line_main.c b/cmd_line_main.c
index 4df6e98..da5d071 100644
--- a/cmd_line_main.c
+++ b/cmd_line_main.c
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 9/13/18
=============================================================================*/
diff --git a/example.c b/example.c
index d580c78..ed5d597 100644
--- a/example.c
+++ b/example.c
@@ -6,7 +6,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 6/30/2020
========================================================================== */
diff --git a/example.h b/example.h
index b5bcf4b..903b3f5 100644
--- a/example.h
+++ b/example.h
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 6/30/20
=============================================================================*/
diff --git a/inc/qcbor/qcbor_spiffy_decode.h b/inc/qcbor/qcbor_spiffy_decode.h
index d236392..106be43 100644
--- a/inc/qcbor/qcbor_spiffy_decode.h
+++ b/inc/qcbor/qcbor_spiffy_decode.h
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
- * See BSD-3-Clause license in README.md
+ * See BSD-3-Clause license in file named "LICENSE"
*
* Forked from qcbor_decode.h on 7/23/2020
* ========================================================================== */
diff --git a/src/ieee754.c b/src/ieee754.c
index 2d98159..1744368 100644
--- a/src/ieee754.c
+++ b/src/ieee754.c
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
- * See BSD-3-Clause license in README.md
+ * See BSD-3-Clause license in file named "LICENSE"
*
* Created on 7/23/18
* ========================================================================== */
diff --git a/src/ieee754.h b/src/ieee754.h
index 863019b..3013dc6 100644
--- a/src/ieee754.h
+++ b/src/ieee754.h
@@ -5,7 +5,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
- * See BSD-3-Clause license in README.md
+ * See BSD-3-Clause license in file named "LICENSE"
*
* Created on 7/23/18
* ========================================================================== */
diff --git a/src/qcbor_err_to_str.c b/src/qcbor_err_to_str.c
index 87c2b28..f9588e5 100644
--- a/src/qcbor_err_to_str.c
+++ b/src/qcbor_err_to_str.c
@@ -7,7 +7,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
- * See BSD-3-Clause license in README.md
+ * See BSD-3-Clause license in file named "LICENSE"
*
* Created on 3/21/20
* ========================================================================== */
diff --git a/test/float_tests.c b/test/float_tests.c
index 97f92bf..6e00472 100644
--- a/test/float_tests.c
+++ b/test/float_tests.c
@@ -6,7 +6,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*
- * See BSD-3-Clause license in README.md
+ * See BSD-3-Clause license in file named "LICENSE"
*
* Created on 9/19/18
* ========================================================================= */
diff --git a/test/float_tests.h b/test/float_tests.h
index 427aa76..cfc2e6e 100644
--- a/test/float_tests.h
+++ b/test/float_tests.h
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 9/19/18
=============================================================================*/
diff --git a/test/half_to_double_from_rfc7049.h b/test/half_to_double_from_rfc7049.h
index 8e07dc2..aa3b4c3 100644
--- a/test/half_to_double_from_rfc7049.h
+++ b/test/half_to_double_from_rfc7049.h
@@ -6,7 +6,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 9/23/18
============================================================================*/
diff --git a/test/not_well_formed_cbor.h b/test/not_well_formed_cbor.h
index 5a213ef..c325768 100644
--- a/test/not_well_formed_cbor.h
+++ b/test/not_well_formed_cbor.h
@@ -7,7 +7,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 7/27/19
==============================================================================*/
diff --git a/test/run_tests.c b/test/run_tests.c
index 140eb53..8211a5a 100644
--- a/test/run_tests.c
+++ b/test/run_tests.c
@@ -6,7 +6,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 9/30/18
=============================================================================*/
diff --git a/test/run_tests.h b/test/run_tests.h
index 6790710..370558a 100644
--- a/test/run_tests.h
+++ b/test/run_tests.h
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created 9/30/18
=============================================================================*/
diff --git a/ub-example.c b/ub-example.c
index 996cf3a..ec776dc 100644
--- a/ub-example.c
+++ b/ub-example.c
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 4/8/22
========================================================================== */
diff --git a/ub-example.h b/ub-example.h
index 131c807..93449f4 100644
--- a/ub-example.h
+++ b/ub-example.h
@@ -5,7 +5,7 @@
SPDX-License-Identifier: BSD-3-Clause
- See BSD-3-Clause license in README.md
+ See BSD-3-Clause license in file named "LICENSE"
Created on 4/8/22
========================================================================== */