From c3bf9bd4a0c2ec58ce11e0fe3cbb58c67bde1c06 Mon Sep 17 00:00:00 2001 From: HerrHulaHoop Date: Sun, 2 May 2021 13:56:32 +0530 Subject: [PATCH] Correct mismatched licenses in Crypto 5 files in Crypto were licensed under GPL-3.0-only which is incompatible with our project's GPL-2.0-only license. They have now been corrected to use GPL-2.0-or-later. --- rpcs3/Crypto/ec.h | 4 ++-- rpcs3/Crypto/lz.cpp | 4 ++-- rpcs3/Crypto/lz.h | 4 ++-- rpcs3/Crypto/utils.cpp | 4 ++-- rpcs3/Crypto/utils.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Crypto/ec.h b/rpcs3/Crypto/ec.h index 447674f012..3ad8cf98cb 100644 --- a/rpcs3/Crypto/ec.h +++ b/rpcs3/Crypto/ec.h @@ -1,8 +1,8 @@ #pragma once // Copyright (C) 2014 Hykem -// Licensed under the terms of the GNU GPL, version 3 -// http://www.gnu.org/licenses/gpl-3.0.txt +// Licensed under the terms of the GNU GPL, version 2.0 or later versions. +// http://www.gnu.org/licenses/gpl-2.0.txt #include "util/types.hpp" diff --git a/rpcs3/Crypto/lz.cpp b/rpcs3/Crypto/lz.cpp index d1d98982c3..da2b05c361 100644 --- a/rpcs3/Crypto/lz.cpp +++ b/rpcs3/Crypto/lz.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Hykem -// Licensed under the terms of the GNU GPL, version 3 -// http://www.gnu.org/licenses/gpl-3.0.txt +// Licensed under the terms of the GNU GPL, version 2.0 or later versions. +// http://www.gnu.org/licenses/gpl-2.0.txt #include "lz.h" diff --git a/rpcs3/Crypto/lz.h b/rpcs3/Crypto/lz.h index 3c28ca48be..b8ad0f3a0e 100644 --- a/rpcs3/Crypto/lz.h +++ b/rpcs3/Crypto/lz.h @@ -1,8 +1,8 @@ #pragma once // Copyright (C) 2014 Hykem -// Licensed under the terms of the GNU GPL, version 3 -// http://www.gnu.org/licenses/gpl-3.0.txt +// Licensed under the terms of the GNU GPL, version 2.0 or later versions. +// http://www.gnu.org/licenses/gpl-2.0.txt // Reverse-engineered custom Lempel–Ziv–Markov based compression. diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp index c2a23f4b57..024c2018dd 100644 --- a/rpcs3/Crypto/utils.cpp +++ b/rpcs3/Crypto/utils.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014 Hykem -// Licensed under the terms of the GNU GPL, version 3 -// http://www.gnu.org/licenses/gpl-3.0.txt +// Licensed under the terms of the GNU GPL, version 2.0 or later versions. +// http://www.gnu.org/licenses/gpl-2.0.txt #include "utils.h" #include "aes.h" diff --git a/rpcs3/Crypto/utils.h b/rpcs3/Crypto/utils.h index 7c98293b7f..56f35565ac 100644 --- a/rpcs3/Crypto/utils.h +++ b/rpcs3/Crypto/utils.h @@ -1,8 +1,8 @@ #pragma once // Copyright (C) 2014 Hykem -// Licensed under the terms of the GNU GPL, version 3 -// http://www.gnu.org/licenses/gpl-3.0.txt +// Licensed under the terms of the GNU GPL, version 2.0 or later versions. +// http://www.gnu.org/licenses/gpl-2.0.txt #include "util/types.hpp"