diff --git a/LICENSE b/LICENSE index 4650c3de..12d37f56 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,21 @@ -WPScan - WordPress Security Scanner -Copyright (C) 2012-2013 +The WPScan software and its data (henceforth both referred to simply as "WPScan") is dual-licensed — copyright 2011-2014 The WPScan Team. -This program 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 -(at your option) any later version. +Cases that include commercialization of WPScan require a commercial, non-free license. Otherwise, the system can be used under the terms of the GNU General Public License. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Cases of commercialization are: + +- Using WPScan to provide commercial managed/Software-as-a-Service services. +- Distributing WPScan as a commercial product or as part of one. + +Cases which don’t require a commercial license, and thus fall under the terms of GNU General Public License, include (but are not limited to): + +- Penetration testers (or penetration testing organizations) using WPScan as part of their assessment toolkit. So long as that doesn’t conflict with the commercialization clause. +- Using WPScan to test your own systems. +- Any non-commercial use of WPScan. + +If you need to acquire a commercial license or are unsure about whether you need to acquire a commercial license, please get in touch, we’ll be happy to clarify things for you and work with you to accommodate your requirements. + +wpscanteam at gmail.com You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/README b/README index a2ee5f40..7b6a0f4f 100644 --- a/README +++ b/README @@ -9,24 +9,28 @@ __________________________________________________ ==LICENSE== -WPScan - WordPress Security Scanner -Copyright (C) 2011-2013 The WPScan Team +The WPScan software and its data (henceforth both referred to simply as "WPScan") is dual-licensed — copyright 2011-2014 The WPScan Team. -This program 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 -(at your option) any later version. +Cases that include commercialization of WPScan require a commercial, non-free license. Otherwise, the system can be used under the terms of the GNU General Public License. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Cases of commercialization are: + +- Using WPScan to provide commercial managed/Software-as-a-Service services. +- Distributing WPScan as a commercial product or as part of one. + +Cases which don’t require a commercial license, and thus fall under the terms of GNU General Public License, include (but are not limited to): + +- Penetration testers (or penetration testing organizations) using WPScan as part of their assessment toolkit. So long as that doesn’t conflict with the commercialization clause. +- Using WPScan to test your own systems. +- Any non-commercial use of WPScan. + +If you need to acquire a commercial license or are unsure about whether you need to acquire a commercial license, please get in touch, we’ll be happy to clarify things for you and work with you to accommodate your requirements. + +wpscanteam at gmail.com You should have received a copy of the GNU General Public License along with this program. If not, see . -wpscanteam at gmail.com - ==INSTALL== WPScan comes pre-installed on the following Linux distributions: diff --git a/README.md b/README.md index a2c57c96..f6de788c 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,28 @@ #### LICENSE -WPScan - WordPress Security Scanner -Copyright (C), 2011-2014 The WPScan Team +The WPScan software and its data (henceforth both referred to simply as "WPScan") is dual-licensed — copyright 2011-2014 The WPScan Team. -This program 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 -(at your option) any later version. +Cases that include commercialization of WPScan require a commercial, non-free license. Otherwise, the system can be used under the terms of the GNU General Public License. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Cases of commercialization are: + +- Using WPScan to provide commercial managed/Software-as-a-Service services. +- Distributing WPScan as a commercial product or as part of one. + +Cases which don’t require a commercial license, and thus fall under the terms of GNU General Public License, include (but are not limited to): + +- Penetration testers (or penetration testing organizations) using WPScan as part of their assessment toolkit. So long as that doesn’t conflict with the commercialization clause. +- Using WPScan to test your own systems. +- Any non-commercial use of WPScan. + +If you need to acquire a commercial license or are unsure about whether you need to acquire a commercial license, please get in touch, we’ll be happy to clarify things for you and work with you to accommodate your requirements. + +wpscanteam at gmail.com You should have received a copy of the GNU General Public License along with this program. If not, see . -wpscanteam at gmail.com - #### INSTALL WPScan comes pre-installed on the following Linux distributions: