From 970391319beb023680eccd0e447e76834dbb4808 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 30 Jun 2020 12:13:13 -0600 Subject: [PATCH] Add or later verbage to LICENSING and sync header license versions --- LICENSING | 7 +++++-- wolfcrypt/src/cryptocb.c | 2 +- wolfcrypt/src/wc_pkcs11.c | 2 +- wolfssl/wolfcrypt/cryptocb.h | 2 +- wolfssl/wolfcrypt/pkcs11.h | 2 +- wolfssl/wolfcrypt/wc_pkcs11.h | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/LICENSING b/LICENSING index 9f50165fd..24407d130 100644 --- a/LICENSING +++ b/LICENSING @@ -1,7 +1,10 @@ wolfSSL (formerly known as CyaSSL) and wolfCrypt are either licensed for use -under the GPLv2 or a standard commercial license. For our users who cannot use -wolfSSL under GPLv2, a commercial license to wolfSSL and wolfCrypt is available. +under the GPLv2 (or at your option any later version) or a standard commercial +license. For our users who cannot use wolfSSL under GPLv2 +(or any later version), a commercial license to wolfSSL and wolfCrypt is +available. + Please contact wolfSSL Inc. directly at: Email: licensing@wolfssl.com diff --git a/wolfcrypt/src/cryptocb.c b/wolfcrypt/src/cryptocb.c index 79f89dbb1..d92f2a104 100644 --- a/wolfcrypt/src/cryptocb.c +++ b/wolfcrypt/src/cryptocb.c @@ -6,7 +6,7 @@ * * wolfSSL is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * wolfSSL is distributed in the hope that it will be useful, diff --git a/wolfcrypt/src/wc_pkcs11.c b/wolfcrypt/src/wc_pkcs11.c index cac0a0fcc..eb19558eb 100644 --- a/wolfcrypt/src/wc_pkcs11.c +++ b/wolfcrypt/src/wc_pkcs11.c @@ -6,7 +6,7 @@ * * wolfSSL is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * wolfSSL is distributed in the hope that it will be useful, diff --git a/wolfssl/wolfcrypt/cryptocb.h b/wolfssl/wolfcrypt/cryptocb.h index eb42d2675..badf69ab8 100644 --- a/wolfssl/wolfcrypt/cryptocb.h +++ b/wolfssl/wolfcrypt/cryptocb.h @@ -6,7 +6,7 @@ * * wolfSSL is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * wolfSSL is distributed in the hope that it will be useful, diff --git a/wolfssl/wolfcrypt/pkcs11.h b/wolfssl/wolfcrypt/pkcs11.h index 93e1af187..bf1cb1ec9 100644 --- a/wolfssl/wolfcrypt/pkcs11.h +++ b/wolfssl/wolfcrypt/pkcs11.h @@ -6,7 +6,7 @@ * * wolfSSL is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * wolfSSL is distributed in the hope that it will be useful, diff --git a/wolfssl/wolfcrypt/wc_pkcs11.h b/wolfssl/wolfcrypt/wc_pkcs11.h index d8dfae5a8..55e154604 100644 --- a/wolfssl/wolfcrypt/wc_pkcs11.h +++ b/wolfssl/wolfcrypt/wc_pkcs11.h @@ -6,7 +6,7 @@ * * wolfSSL is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * wolfSSL is distributed in the hope that it will be useful,