Fixed copyright notices.

10 files changed, 61 insertions, 43 deletions

diff --git a/ecdsa_fpga_curve.h b/ecdsa_fpga_curve.h
index e9f2fe6..6ca663c 100644
--- a/ecdsa_fpga_curve.h
+++ b/ecdsa_fpga_curve.h
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018, 2021 NORDUnet A/S
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_curve_abstract.cpp b/ecdsa_fpga_curve_abstract.cpp
index 2d25cfc..23c06e6 100644
--- a/ecdsa_fpga_curve_abstract.cpp
+++ b/ecdsa_fpga_curve_abstract.cpp
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018, 2021 NORDUnet A/S
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_curve_microcode.cpp b/ecdsa_fpga_curve_microcode.cpp
index 84083f6..57dd617 100644
--- a/ecdsa_fpga_curve_microcode.cpp
+++ b/ecdsa_fpga_curve_microcode.cpp
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2018, 2021 NORDUnet A/S
+// Copyright 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_microcode.cpp b/ecdsa_fpga_microcode.cpp
index 29920c6..896217b 100644
--- a/ecdsa_fpga_microcode.cpp
+++ b/ecdsa_fpga_microcode.cpp
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2018, 2021 NORDUnet A/S
+// Copyright 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_microcode.h b/ecdsa_fpga_microcode.h
index db53b46..e475cb7 100644
--- a/ecdsa_fpga_microcode.h
+++ b/ecdsa_fpga_microcode.h
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2018, 2021 NORDUnet A/S
+// Copyright 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_model.cpp b/ecdsa_fpga_model.cpp
index 367d483..0edec7d 100644
--- a/ecdsa_fpga_model.cpp
+++ b/ecdsa_fpga_model.cpp
@@ -6,8 +6,10 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018 NORDUnet A/S
-//
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
+
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
 //
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_model.h b/ecdsa_fpga_model.h
index 7b6a7e3..21ce096 100644
--- a/ecdsa_fpga_model.h
+++ b/ecdsa_fpga_model.h
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018 NORDUnet A/S
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_modular.cpp b/ecdsa_fpga_modular.cpp
index 4ef4dc1..d24ddad 100644
--- a/ecdsa_fpga_modular.cpp
+++ b/ecdsa_fpga_modular.cpp
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018, 2021 NORDUnet A/S
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_fpga_modular.h b/ecdsa_fpga_modular.h
index 3a054e3..b0fc581 100644
--- a/ecdsa_fpga_modular.h
+++ b/ecdsa_fpga_modular.h
@@ -6,7 +6,9 @@
 //
 // Authors: Pavel Shatov
 //
-// Copyright (c) 2015-2016, 2018, 2021 NORDUnet A/S
+// Copyright 2015-2016, 2018 NORDUnet A/S
+// Copyright 2021 The Commons Conservancy Cryptech Project
+// SPDX-License-Identifier: BSD-3-Clause
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -18,9 +20,9 @@
 //   this list of conditions and the following disclaimer in the documentation
 //   and/or other materials provided with the distribution.
 //
-// - Neither the name of the NORDUnet nor the names of its contributors may be
-//   used to endorse or promote products derived from this software without
-//   specific prior written permission.
+// - 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
diff --git a/ecdsa_microcode_parser.py b/ecdsa_microcode_parser.py
index ec233d9..edd8328 100644
--- a/ecdsa_microcode_parser.py
+++ b/ecdsa_microcode_parser.py
@@ -3,9 +3,9 @@
 #
 # Author: Pavel Shatov
 #
-# Copyright (c) 2018, 2021 NORDUnet A/S
-#
-# All rights reserved.
+# Copyright 2018 NORDUnet A/S
+# Copyright 2021 The Commons Conservancy Cryptech Project
+# SPDX-License-Identifier: BSD-3-Clause
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -17,9 +17,9 @@
 #   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 NORDUnet A/S nor the
-#   names of its contributors may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
+# * 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