From d0811ed3f9604b2dab755ab6df0a2950fd1ccede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 7 Jun 2018 10:46:05 +0200 Subject: [PATCH] Thirdparty: Fill copyright for lws, miniupnpc, clipper Rename `lws` to `libwebsockets` which is its library name. Add missing license file for mbedtls. --- COPYRIGHT.txt | 643 +++++++++++++++++- modules/websocket/SCsub | 4 +- thirdparty/README.md | 15 +- thirdparty/{lws => libwebsockets}/LICENSE.txt | 0 thirdparty/{lws => libwebsockets}/alloc.c | 0 .../client/client-handshake.c | 0 .../client/client-parser.c | 0 .../{lws => libwebsockets}/client/client.c | 0 .../client/ssl-client.c | 0 thirdparty/{lws => libwebsockets}/context.c | 0 .../ext/extension-permessage-deflate.c | 0 .../ext/extension-permessage-deflate.h | 0 .../{lws => libwebsockets}/ext/extension.c | 0 thirdparty/{lws => libwebsockets}/handshake.c | 0 thirdparty/{lws => libwebsockets}/header.c | 0 .../{lws => libwebsockets}/lextable-strings.h | 0 thirdparty/{lws => libwebsockets}/lextable.h | 0 .../{lws => libwebsockets}/libwebsockets.c | 0 .../{lws => libwebsockets}/libwebsockets.h | 0 .../{lws => libwebsockets}/lws_config.h | 0 .../lws_config_private.h | 0 .../mbedtls_verify.diff | 12 +- .../mbedtls_wrapper/include/internal/ssl3.h | 0 .../include/internal/ssl_cert.h | 0 .../include/internal/ssl_code.h | 0 .../include/internal/ssl_dbg.h | 0 .../include/internal/ssl_lib.h | 0 .../include/internal/ssl_methods.h | 0 .../include/internal/ssl_pkey.h | 0 .../include/internal/ssl_stack.h | 0 .../include/internal/ssl_types.h | 0 .../include/internal/ssl_x509.h | 0 .../mbedtls_wrapper/include/internal/tls1.h | 0 .../include/internal/x509_vfy.h | 0 .../mbedtls_wrapper/include/openssl/ssl.h | 0 .../mbedtls_wrapper/include/platform/ssl_pm.h | 0 .../include/platform/ssl_port.h | 0 .../mbedtls_wrapper/library/ssl_cert.c | 0 .../mbedtls_wrapper/library/ssl_lib.c | 0 .../mbedtls_wrapper/library/ssl_methods.c | 0 .../mbedtls_wrapper/library/ssl_pkey.c | 0 .../mbedtls_wrapper/library/ssl_stack.c | 0 .../mbedtls_wrapper/library/ssl_x509.c | 0 .../mbedtls_wrapper/platform/ssl_pm.c | 0 .../mbedtls_wrapper/platform/ssl_port.c | 0 .../misc/base64-decode.c | 0 .../{lws => libwebsockets}/misc/getifaddrs.c | 0 .../{lws => libwebsockets}/misc/getifaddrs.h | 0 thirdparty/{lws => libwebsockets}/misc/lejp.c | 0 thirdparty/{lws => libwebsockets}/misc/lejp.h | 0 .../{lws => libwebsockets}/misc/sha-1.c | 0 thirdparty/{lws => libwebsockets}/output.c | 0 .../plat/lws-plat-unix.c | 0 .../plat/lws-plat-win.c | 0 thirdparty/{lws => libwebsockets}/pollfd.c | 0 .../private-libwebsockets.h | 0 .../{lws => libwebsockets}/server/fops-zip.c | 0 .../{lws => libwebsockets}/server/lejp-conf.c | 0 .../{lws => libwebsockets}/server/parsers.c | 0 .../{lws => libwebsockets}/server/ranges.c | 0 .../server/server-handshake.c | 0 .../{lws => libwebsockets}/server/server.c | 0 .../server/ssl-server.c | 0 thirdparty/{lws => libwebsockets}/service.c | 0 thirdparty/{lws => libwebsockets}/ssl.c | 0 .../win32helpers/getopt.c | 0 .../win32helpers/getopt.h | 0 .../win32helpers/getopt_long.c | 0 .../win32helpers/gettimeofday.c | 0 .../win32helpers/gettimeofday.h | 0 thirdparty/mbedtls/LICENSE | 2 + thirdparty/mbedtls/apache-2.0.txt | 202 ++++++ 72 files changed, 844 insertions(+), 34 deletions(-) rename thirdparty/{lws => libwebsockets}/LICENSE.txt (100%) rename thirdparty/{lws => libwebsockets}/alloc.c (100%) rename thirdparty/{lws => libwebsockets}/client/client-handshake.c (100%) rename thirdparty/{lws => libwebsockets}/client/client-parser.c (100%) rename thirdparty/{lws => libwebsockets}/client/client.c (100%) rename thirdparty/{lws => libwebsockets}/client/ssl-client.c (100%) rename thirdparty/{lws => libwebsockets}/context.c (100%) rename thirdparty/{lws => libwebsockets}/ext/extension-permessage-deflate.c (100%) rename thirdparty/{lws => libwebsockets}/ext/extension-permessage-deflate.h (100%) rename thirdparty/{lws => libwebsockets}/ext/extension.c (100%) rename thirdparty/{lws => libwebsockets}/handshake.c (100%) rename thirdparty/{lws => libwebsockets}/header.c (100%) rename thirdparty/{lws => libwebsockets}/lextable-strings.h (100%) rename thirdparty/{lws => libwebsockets}/lextable.h (100%) rename thirdparty/{lws => libwebsockets}/libwebsockets.c (100%) rename thirdparty/{lws => libwebsockets}/libwebsockets.h (100%) rename thirdparty/{lws => libwebsockets}/lws_config.h (100%) rename thirdparty/{lws => libwebsockets}/lws_config_private.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_verify.diff (84%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl3.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_cert.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_code.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_dbg.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_lib.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_methods.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_pkey.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_stack.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_types.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/ssl_x509.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/tls1.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/internal/x509_vfy.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/openssl/ssl.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/platform/ssl_pm.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/include/platform/ssl_port.h (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_cert.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_lib.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_methods.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_pkey.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_stack.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/library/ssl_x509.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/platform/ssl_pm.c (100%) rename thirdparty/{lws => libwebsockets}/mbedtls_wrapper/platform/ssl_port.c (100%) rename thirdparty/{lws => libwebsockets}/misc/base64-decode.c (100%) rename thirdparty/{lws => libwebsockets}/misc/getifaddrs.c (100%) rename thirdparty/{lws => libwebsockets}/misc/getifaddrs.h (100%) rename thirdparty/{lws => libwebsockets}/misc/lejp.c (100%) rename thirdparty/{lws => libwebsockets}/misc/lejp.h (100%) rename thirdparty/{lws => libwebsockets}/misc/sha-1.c (100%) rename thirdparty/{lws => libwebsockets}/output.c (100%) rename thirdparty/{lws => libwebsockets}/plat/lws-plat-unix.c (100%) rename thirdparty/{lws => libwebsockets}/plat/lws-plat-win.c (100%) rename thirdparty/{lws => libwebsockets}/pollfd.c (100%) rename thirdparty/{lws => libwebsockets}/private-libwebsockets.h (100%) rename thirdparty/{lws => libwebsockets}/server/fops-zip.c (100%) rename thirdparty/{lws => libwebsockets}/server/lejp-conf.c (100%) rename thirdparty/{lws => libwebsockets}/server/parsers.c (100%) rename thirdparty/{lws => libwebsockets}/server/ranges.c (100%) rename thirdparty/{lws => libwebsockets}/server/server-handshake.c (100%) rename thirdparty/{lws => libwebsockets}/server/server.c (100%) rename thirdparty/{lws => libwebsockets}/server/ssl-server.c (100%) rename thirdparty/{lws => libwebsockets}/service.c (100%) rename thirdparty/{lws => libwebsockets}/ssl.c (100%) rename thirdparty/{lws => libwebsockets}/win32helpers/getopt.c (100%) rename thirdparty/{lws => libwebsockets}/win32helpers/getopt.h (100%) rename thirdparty/{lws => libwebsockets}/win32helpers/getopt_long.c (100%) rename thirdparty/{lws => libwebsockets}/win32helpers/gettimeofday.c (100%) rename thirdparty/{lws => libwebsockets}/win32helpers/gettimeofday.h (100%) create mode 100644 thirdparty/mbedtls/LICENSE create mode 100644 thirdparty/mbedtls/apache-2.0.txt diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 6b6ee4c5096..164f07df518 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -218,11 +218,21 @@ Comment: WebP codec Copyright: 2010, Google Inc. License: BSD-3-clause +Files: ./thirdparty/libwebsockets/ +Comment: libwebsockets +Copyright: 2010-2017, Andy Green +License: LGPL-2.1+SLE (lws) + Files: ./thirdparty/mbedtls/ Comment: Mbed TLS Copyright: 2006-2015, ARM Limited License: Apache-2.0 +Files: ./thirdparty/miniupnpc/ +Comment: MiniUPnPc +Copyright: 2005-2016, Thomas Bernard +License: BSD-3-clause + Files: ./thirdparty/minizip/ Comment: MiniZip Copyright: 1998-2010, Gilles Vollant @@ -244,6 +254,12 @@ Comment: BASE64 conversion methods Copyright: Ari Edelkind License: public-domain +Files: ./thirdparty/misc/clipper.cpp + ./thirdparty/misc/clipper.hpp +Comment: Clipper +Copyright: 2010-2017, Angus Johnson +License: BSL-1.0 + Files: ./thirdparty/misc/curl_hostcheck.c ./thirdparty/misc/curl_hostcheck.h Comment: curl @@ -378,30 +394,6 @@ License: Apache-2.0 See the License for the specific language governing permissions and limitations under the License. -License: BSD-2-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - 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 author - 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. - License: Bitstream Vera Fonts Copyright Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. @@ -444,6 +436,28 @@ License: Bitstream Vera Fonts Copyright authorization from the GNOME Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * 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. + . + 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. + License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -472,6 +486,31 @@ License: BSD-3-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSL-1.0 + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + License: CC-BY-3.0 Creative Commons Attribution 3.0 Unported . @@ -1022,6 +1061,562 @@ License: ISC ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +License: LGPL-2.1+SLE (lws) + Libwebsockets and included programs are provided under the terms of the GNU + Library General Public License (LGPL) 2.1, with the following exceptions: + . + 1) Any reference, whether in these modifications or in the GNU + Library General Public License 2.1, to this License, these terms, the + GNU Lesser Public License, GNU Library General Public License, LGPL, or + any similar reference shall refer to the GNU Library General Public + License 2.1 as modified by these paragraphs 1) through 4). + . + 2) Static linking of programs with the libwebsockets library does not + constitute a derivative work and does not require the author to provide + source code for the program, use the shared libwebsockets libraries, or + link their program against a user-supplied version of libwebsockets. + . + If you link the program to a modified version of libwebsockets, then the + changes to libwebsockets must be provided under the terms of the LGPL in + sections 1, 2, and 4. + . + 3) You do not have to provide a copy of the libwebsockets license with + programs that are linked to the libwebsockets library, nor do you have to + identify the libwebsockets license in your program or documentation as + required by section 6 of the LGPL. + . + However, programs must still identify their use of libwebsockets. The + following example statement can be included in user documentation to + satisfy this requirement: + . + "[program] is based in part on the work of the libwebsockets project + (https://libwebsockets.org)" + . + 4) Some sources included have their own, more liberal licenses, or options + to get original sources with the liberal terms. + . + Original liberal license retained + . + - lib/sha-1.c - 3-clause BSD license retained, link to original + - win32port/zlib - ZLIB license (see zlib.h) + . + Relicensed to libwebsocket license + . + - lib/base64-decode.c - relicensed to LGPL2.1+SLE, link to original + - lib/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE, + link to original Public Domain version + . + Public Domain (CC-zero) to simplify reuse + . + - test-server/*.c + - test-server/*.h + - lwsws/* + . + ------ end of exceptions + . + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + . + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + . + [This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + . + Preamble + . + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + Licenses are intended to guarantee your freedom to share and change + free software--to make sure the software is free for all its users. + . + This license, the Lesser General Public License, applies to some + specially designated software packages--typically libraries--of the + Free Software Foundation and other authors who decide to use it. You + can use it too, but we suggest you first think carefully about whether + this license or the ordinary General Public License is the better + strategy to use in any particular case, based on the explanations below. + . + When we speak of free software, we are referring to freedom of use, + not price. Our General Public Licenses are designed to make sure that + you have the freedom to distribute copies of free software (and charge + for this service if you wish); that you receive source code or can get + it if you want it; that you can change the software and use pieces of + it in new free programs; and that you are informed that you can do + these things. + . + To protect your rights, we need to make restrictions that forbid + distributors to deny you these rights or to ask you to surrender these + rights. These restrictions translate to certain responsibilities for + you if you distribute copies of the library or if you modify it. + . + For example, if you distribute copies of the library, whether gratis + or for a fee, you must give the recipients all the rights that we gave + you. You must make sure that they, too, receive or can get the source + code. If you link other code with the library, you must provide + complete object files to the recipients, so that they can relink them + with the library after making changes to the library and recompiling + it. And you must show them these terms so they know their rights. + . + We protect your rights with a two-step method: (1) we copyright the + library, and (2) we offer you this license, which gives you legal + permission to copy, distribute and/or modify the library. + . + To protect each distributor, we want to make it very clear that + there is no warranty for the free library. Also, if the library is + modified by someone else and passed on, the recipients should know + that what they have is not the original version, so that the original + author's reputation will not be affected by problems that might be + introduced by others. + . + Finally, software patents pose a constant threat to the existence of + any free program. We wish to make sure that a company cannot + effectively restrict the users of a free program by obtaining a + restrictive license from a patent holder. Therefore, we insist that + any patent license obtained for a version of the library must be + consistent with the full freedom of use specified in this license. + . + Most GNU software, including some libraries, is covered by the + ordinary GNU General Public License. This license, the GNU Lesser + General Public License, applies to certain designated libraries, and + is quite different from the ordinary General Public License. We use + this license for certain libraries in order to permit linking those + libraries into non-free programs. + . + When a program is linked with a library, whether statically or using + a shared library, the combination of the two is legally speaking a + combined work, a derivative of the original library. The ordinary + General Public License therefore permits such linking only if the + entire combination fits its criteria of freedom. The Lesser General + Public License permits more lax criteria for linking other code with + the library. + . + We call this license the "Lesser" General Public License because it + does Less to protect the user's freedom than the ordinary General + Public License. It also provides other free software developers Less + of an advantage over competing non-free programs. These disadvantages + are the reason we use the ordinary General Public License for many + libraries. However, the Lesser license provides advantages in certain + special circumstances. + . + For example, on rare occasions, there may be a special need to + encourage the widest possible use of a certain library, so that it becomes + a de-facto standard. To achieve this, non-free programs must be + allowed to use the library. A more frequent case is that a free + library does the same job as widely used non-free libraries. In this + case, there is little to gain by limiting the free library to free + software only, so we use the Lesser General Public License. + . + In other cases, permission to use a particular library in non-free + programs enables a greater number of people to use a large body of + free software. For example, permission to use the GNU C Library in + non-free programs enables many more people to use the whole GNU + operating system, as well as its variant, the GNU/Linux operating + system. + . + Although the Lesser General Public License is Less protective of the + users' freedom, it does ensure that the user of a program that is + linked with the Library has the freedom and the wherewithal to run + that program using a modified version of the Library. + . + The precise terms and conditions for copying, distribution and + modification follow. Pay close attention to the difference between a + "work based on the library" and a "work that uses the library". The + former contains code derived from the library, whereas the latter must + be combined with the library in order to run. + . + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. This License Agreement applies to any software library or other + program which contains a notice placed by the copyright holder or + other authorized party saying it may be distributed under the terms of + this Lesser General Public License (also called "this License"). + Each licensee is addressed as "you". + . + A "library" means a collection of software functions and/or data + prepared so as to be conveniently linked with application programs + (which use some of those functions and data) to form executables. + . + The "Library", below, refers to any such software library or work + which has been distributed under these terms. A "work based on the + Library" means either the Library or any derivative work under + copyright law: that is to say, a work containing the Library or a + portion of it, either verbatim or with modifications and/or translated + straightforwardly into another language. (Hereinafter, translation is + included without limitation in the term "modification".) + . + "Source code" for a work means the preferred form of the work for + making modifications to it. For a library, complete source code means + all the source code for all modules it contains, plus any associated + interface definition files, plus the scripts used to control compilation + and installation of the library. + . + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running a program using the Library is not restricted, and output from + such a program is covered only if its contents constitute a work based + on the Library (independent of the use of the Library in a tool for + writing it). Whether that is true depends on what the Library does + and what the program that uses the Library does. + . + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep intact + all the notices that refer to this License and to the absence of any + warranty; and distribute a copy of this License along with the + Library. + . + You may charge a fee for the physical act of transferring a copy, + and you may at your option offer warranty protection in exchange for a + fee. + . + 2. You may modify your copy or copies of the Library or any portion + of it, thus forming a work based on the Library, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + . + a) The modified work must itself be a software library. + . + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + . + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + . + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + . + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + . + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Library, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Library, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote + it. + . + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Library. + . + In addition, mere aggregation of another work not based on the Library + with the Library (or with a work based on the Library) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + . + 3. You may opt to apply the terms of the ordinary GNU General Public + License instead of this License to a given copy of the Library. To do + this, you must alter all the notices that refer to this License, so + that they refer to the ordinary GNU General Public License, version 2, + instead of to this License. (If a newer version than version 2 of the + ordinary GNU General Public License has appeared, then you can specify + that version instead if you wish.) Do not make any other change in + these notices. + . + Once this change is made in a given copy, it is irreversible for + that copy, so the ordinary GNU General Public License applies to all + subsequent copies and derivative works made from that copy. + . + This option is useful when you wish to copy part of the code of + the Library into a program that is not a library. + . + 4. You may copy and distribute the Library (or a portion or + derivative of it, under Section 2) in object code or executable form + under the terms of Sections 1 and 2 above provided that you accompany + it with the complete corresponding machine-readable source code, which + must be distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange. + . + If distribution of object code is made by offering access to copy + from a designated place, then offering equivalent access to copy the + source code from the same place satisfies the requirement to + distribute the source code, even though third parties are not + compelled to copy the source along with the object code. + . + 5. A program that contains no derivative of any portion of the + Library, but is designed to work with the Library by being compiled or + linked with it, is called a "work that uses the Library". Such a + work, in isolation, is not a derivative work of the Library, and + therefore falls outside the scope of this License. + . + However, linking a "work that uses the Library" with the Library + creates an executable that is a derivative of the Library (because it + contains portions of the Library), rather than a "work that uses the + library". The executable is therefore covered by this License. + Section 6 states terms for distribution of such executables. + . + When a "work that uses the Library" uses material from a header file + that is part of the Library, the object code for the work may be a + derivative work of the Library even though the source code is not. + Whether this is true is especially significant if the work can be + linked without the Library, or if the work is itself a library. The + threshold for this to be true is not precisely defined by law. + . + If such an object file uses only numerical parameters, data + structure layouts and accessors, and small macros and small inline + functions (ten lines or less in length), then the use of the object + file is unrestricted, regardless of whether it is legally a derivative + work. (Executables containing this object code plus portions of the + Library will still fall under Section 6.) + . + Otherwise, if the work is a derivative of the Library, you may + distribute the object code for the work under the terms of Section 6. + Any executables containing that work also fall under Section 6, + whether or not they are linked directly with the Library itself. + . + 6. As an exception to the Sections above, you may also combine or + link a "work that uses the Library" with the Library to produce a + work containing portions of the Library, and distribute that work + under terms of your choice, provided that the terms permit + modification of the work for the customer's own use and reverse + engineering for debugging such modifications. + . + You must give prominent notice with each copy of the work that the + Library is used in it and that the Library and its use are covered by + this License. You must supply a copy of this License. If the work + during execution displays copyright notices, you must include the + copyright notice for the Library among them, as well as a reference + directing the user to the copy of this License. Also, you must do one + of these things: + . + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + . + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + . + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + . + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + . + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + . + For an executable, the required form of the "work that uses the + Library" must include any data and utility programs needed for + reproducing the executable from it. However, as a special exception, + the materials to be distributed need not include anything that is + normally distributed (in either source or binary form) with the major + components (compiler, kernel, and so on) of the operating system on + which the executable runs, unless that component itself accompanies + the executable. + . + It may happen that this requirement contradicts the license + restrictions of other proprietary libraries that do not normally + accompany the operating system. Such a contradiction means you cannot + use both them and the Library together in an executable that you + distribute. + . + 7. You may place library facilities that are a work based on the + Library side-by-side in a single library together with other library + facilities not covered by this License, and distribute such a combined + library, provided that the separate distribution of the work based on + the Library and of the other library facilities is otherwise + permitted, and provided that you do these two things: + . + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + . + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + . + 8. You may not copy, modify, sublicense, link with, or distribute + the Library except as expressly provided under this License. Any + attempt otherwise to copy, modify, sublicense, link with, or + distribute the Library is void, and will automatically terminate your + rights under this License. However, parties who have received copies, + or rights, from you under this License will not have their licenses + terminated so long as such parties remain in full compliance. + . + 9. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Library or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Library (or any work based on the + Library), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Library or works based on it. + . + 10. Each time you redistribute the Library (or any work based on the + Library), the recipient automatically receives a license from the + original licensor to copy, distribute, link with or modify the Library + subject to these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties with + this License. + . + 11. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Library at all. For example, if a patent + license would not permit royalty-free redistribution of the Library by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Library. + . + If any portion of this section is held invalid or unenforceable under any + particular circumstance, the balance of the section is intended to apply, + and the section as a whole is intended to apply in other circumstances. + . + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + . + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + . + 12. If the distribution and/or use of the Library is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Library under this License may add + an explicit geographical distribution limitation excluding those countries, + so that distribution is permitted only in or among countries not thus + excluded. In such case, this License incorporates the limitation as if + written in the body of this License. + . + 13. The Free Software Foundation may publish revised and/or new + versions of the Lesser General Public License from time to time. + Such new versions will be similar in spirit to the present version, + but may differ in detail to address new problems or concerns. + . + Each version is given a distinguishing version number. If the Library + specifies a version number of this License which applies to it and + "any later version", you have the option of following the terms and + conditions either of that version or of any later version published by + the Free Software Foundation. If the Library does not specify a + license version number, you may choose any version ever published by + the Free Software Foundation. + . + 14. If you wish to incorporate parts of the Library into other free + programs whose distribution conditions are incompatible with these, + write to the author to ask for permission. For software which is + copyrighted by the Free Software Foundation, write to the Free + Software Foundation; we sometimes make exceptions for this. Our + decision will be guided by the two goals of preserving the free status + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + . + NO WARRANTY + . + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. + EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR + OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE + LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME + THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + . + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY + AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE + LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING + RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A + FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + . + END OF TERMS AND CONDITIONS + . + How to Apply These Terms to Your New Libraries + . + If you develop a new library, and you want it to be of the greatest + possible use to the public, we recommend making it free software that + everyone can redistribute and change. You can do so by permitting + redistribution under these terms (or, alternatively, under the terms of the + ordinary General Public License). + . + To apply these terms, attach the following notices to the library. It is + safest to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least the + "copyright" line and a pointer to where the full notice is found. + . + + Copyright (C) + . + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + Also add information on how to contact you by electronic and paper mail. + . + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the library, if + necessary. Here is a sample; alter the names: + . + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + . + , 1 April 1990 + Ty Coon, President of Vice + . + That's all there is to it! + License: MPL-2.0 Mozilla Public License Version 2.0 ================================== diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index b36f1beacd1..c9cbdfbc03e 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -7,7 +7,7 @@ Import('env_modules') env_lws = env_modules.Clone() -thirdparty_dir = "#thirdparty/lws/" +thirdparty_dir = "#thirdparty/libwebsockets/" helper_dir = "win32helpers/" thirdparty_sources = [ "client/client.c", @@ -67,7 +67,7 @@ else: env_lws.add_source_files(env.modules_sources, thirdparty_sources) env_lws.Append(CPPPATH=[thirdparty_dir]) - wrapper_includes = ["#thirdparty/lws/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] + wrapper_includes = ["#thirdparty/libwebsockets/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] env_lws.Prepend(CPPPATH=wrapper_includes) if env['builtin_mbedtls']: diff --git a/thirdparty/README.md b/thirdparty/README.md index ac5fe21f1d7..724c6978f0e 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -15,6 +15,7 @@ Important: Some files have Godot-made changes. They are marked with `// -- GODOT start --` and `// -- GODOT end --` comments. + ## bullet - Upstream: https://github.com/bulletphysics/bullet3 @@ -76,6 +77,7 @@ Important: Some files have Godot-made changes. They are marked with `// -- GODOT start --` and `// -- GODOT end --` comments. + ## fonts ### Noto Sans @@ -175,6 +177,7 @@ Important: Some files have Godot-made changes. They are marked with `// -- GODOT start --` and `// -- GODOT end --` comments. + ## libtheora - Upstream: https://www.theora.org @@ -246,12 +249,13 @@ File extracted from upstream source: - Also copy `win32helpers/` from `win32port/` - `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX and FreeBSD (missing `malloc.h`). The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed). -- You might need to apply the patch in `thirdparty/lws/mbedtls_verify.diff` (port of PR 1215) to future `2.4.x` releases if it does not get cherry picked. +- You might need to apply the patch in `thirdparty/libwebsockets/mbedtls_verify.diff` (port of PR 1215) to future `2.4.x` releases if it does not get cherry picked. Important: `lws_config.h` and `lws_config_private.h` contains custom Godot build configurations, check them out when updating. -## mbedTLS + +## mbedtls - Upstream: https://tls.mbed.org/ - Version: 2.8.0 @@ -264,6 +268,7 @@ File extracted from upstream release tarball `mbedtls-2.8.0-apache.tgz`: Be sure to check the Godot addition to only redfine it when undefined or `< 0x0501` (PRed upstream). - Applied the patch in `thirdparty/mbedtls/1453.diff` (PR 1453). Soon to be merged upstream. Check it out at next update. + ## miniupnpc - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc @@ -272,6 +277,7 @@ File extracted from upstream release tarball `mbedtls-2.8.0-apache.tgz`: The only modified file is miniupnpcstrings.h, which was created for Godot (is usually autogenerated by cmake). + ## minizip - Upstream: http://www.zlib.net @@ -301,6 +307,10 @@ Collection of single-file libraries used in Godot components. * Upstream: http://episec.com/people/edelkind/c.html * Version: latest, as of April 2017 * License: Public Domain + - `clipper.{cpp,hpp}` + * Upstream: https://sourceforge.net/projects/polyclipping + * Version: 6.4.2 + * License: BSL-1.0 - `fastlz.{c,h}` * Upstream: https://github.com/ariya/FastLZ * Version: git (f121734, 2007) @@ -369,6 +379,7 @@ Files extracted from the upstream source: - All .h files in `src/` - LICENSE.txt + ## opus - Upstream: https://opus-codec.org diff --git a/thirdparty/lws/LICENSE.txt b/thirdparty/libwebsockets/LICENSE.txt similarity index 100% rename from thirdparty/lws/LICENSE.txt rename to thirdparty/libwebsockets/LICENSE.txt diff --git a/thirdparty/lws/alloc.c b/thirdparty/libwebsockets/alloc.c similarity index 100% rename from thirdparty/lws/alloc.c rename to thirdparty/libwebsockets/alloc.c diff --git a/thirdparty/lws/client/client-handshake.c b/thirdparty/libwebsockets/client/client-handshake.c similarity index 100% rename from thirdparty/lws/client/client-handshake.c rename to thirdparty/libwebsockets/client/client-handshake.c diff --git a/thirdparty/lws/client/client-parser.c b/thirdparty/libwebsockets/client/client-parser.c similarity index 100% rename from thirdparty/lws/client/client-parser.c rename to thirdparty/libwebsockets/client/client-parser.c diff --git a/thirdparty/lws/client/client.c b/thirdparty/libwebsockets/client/client.c similarity index 100% rename from thirdparty/lws/client/client.c rename to thirdparty/libwebsockets/client/client.c diff --git a/thirdparty/lws/client/ssl-client.c b/thirdparty/libwebsockets/client/ssl-client.c similarity index 100% rename from thirdparty/lws/client/ssl-client.c rename to thirdparty/libwebsockets/client/ssl-client.c diff --git a/thirdparty/lws/context.c b/thirdparty/libwebsockets/context.c similarity index 100% rename from thirdparty/lws/context.c rename to thirdparty/libwebsockets/context.c diff --git a/thirdparty/lws/ext/extension-permessage-deflate.c b/thirdparty/libwebsockets/ext/extension-permessage-deflate.c similarity index 100% rename from thirdparty/lws/ext/extension-permessage-deflate.c rename to thirdparty/libwebsockets/ext/extension-permessage-deflate.c diff --git a/thirdparty/lws/ext/extension-permessage-deflate.h b/thirdparty/libwebsockets/ext/extension-permessage-deflate.h similarity index 100% rename from thirdparty/lws/ext/extension-permessage-deflate.h rename to thirdparty/libwebsockets/ext/extension-permessage-deflate.h diff --git a/thirdparty/lws/ext/extension.c b/thirdparty/libwebsockets/ext/extension.c similarity index 100% rename from thirdparty/lws/ext/extension.c rename to thirdparty/libwebsockets/ext/extension.c diff --git a/thirdparty/lws/handshake.c b/thirdparty/libwebsockets/handshake.c similarity index 100% rename from thirdparty/lws/handshake.c rename to thirdparty/libwebsockets/handshake.c diff --git a/thirdparty/lws/header.c b/thirdparty/libwebsockets/header.c similarity index 100% rename from thirdparty/lws/header.c rename to thirdparty/libwebsockets/header.c diff --git a/thirdparty/lws/lextable-strings.h b/thirdparty/libwebsockets/lextable-strings.h similarity index 100% rename from thirdparty/lws/lextable-strings.h rename to thirdparty/libwebsockets/lextable-strings.h diff --git a/thirdparty/lws/lextable.h b/thirdparty/libwebsockets/lextable.h similarity index 100% rename from thirdparty/lws/lextable.h rename to thirdparty/libwebsockets/lextable.h diff --git a/thirdparty/lws/libwebsockets.c b/thirdparty/libwebsockets/libwebsockets.c similarity index 100% rename from thirdparty/lws/libwebsockets.c rename to thirdparty/libwebsockets/libwebsockets.c diff --git a/thirdparty/lws/libwebsockets.h b/thirdparty/libwebsockets/libwebsockets.h similarity index 100% rename from thirdparty/lws/libwebsockets.h rename to thirdparty/libwebsockets/libwebsockets.h diff --git a/thirdparty/lws/lws_config.h b/thirdparty/libwebsockets/lws_config.h similarity index 100% rename from thirdparty/lws/lws_config.h rename to thirdparty/libwebsockets/lws_config.h diff --git a/thirdparty/lws/lws_config_private.h b/thirdparty/libwebsockets/lws_config_private.h similarity index 100% rename from thirdparty/lws/lws_config_private.h rename to thirdparty/libwebsockets/lws_config_private.h diff --git a/thirdparty/lws/mbedtls_verify.diff b/thirdparty/libwebsockets/mbedtls_verify.diff similarity index 84% rename from thirdparty/lws/mbedtls_verify.diff rename to thirdparty/libwebsockets/mbedtls_verify.diff index d320645d673..25c7f4bbdca 100644 --- a/thirdparty/lws/mbedtls_verify.diff +++ b/thirdparty/libwebsockets/mbedtls_verify.diff @@ -1,7 +1,7 @@ -diff --git a/thirdparty/lws/client/ssl-client.c b/thirdparty/lws/client/ssl-client.c +diff --git a/thirdparty/libwebsockets/client/ssl-client.c b/thirdparty/libwebsockets/client/ssl-client.c index 6626e0844..962c6e3cb 100644 ---- a/thirdparty/lws/client/ssl-client.c -+++ b/thirdparty/lws/client/ssl-client.c +--- a/thirdparty/libwebsockets/client/ssl-client.c ++++ b/thirdparty/libwebsockets/client/ssl-client.c @@ -176,11 +176,7 @@ lws_ssl_client_bio_create(struct lws *wsi) #endif #else @@ -15,10 +15,10 @@ index 6626e0844..962c6e3cb 100644 #else #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME SSL_set_tlsext_host_name(wsi->ssl, hostname); -diff --git a/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c b/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c +diff --git a/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c index 63504919c..4e3d61109 100644 ---- a/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c -+++ b/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c +--- a/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c ++++ b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c @@ -218,7 +218,7 @@ static int ssl_pm_reload_crt(SSL *ssl) struct x509_pm *crt_pm = (struct x509_pm *)ssl->cert->x509->x509_pm; diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl3.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl3.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl3.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl3.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_cert.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_cert.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_cert.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_cert.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_code.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_code.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_code.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_code.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_dbg.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_dbg.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_dbg.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_dbg.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_lib.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_lib.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_lib.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_lib.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_methods.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_methods.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_methods.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_methods.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_pkey.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_pkey.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_pkey.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_pkey.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_stack.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_stack.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_stack.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_stack.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_types.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_types.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_types.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_types.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/ssl_x509.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_x509.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/ssl_x509.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/ssl_x509.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/tls1.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/tls1.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/tls1.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/tls1.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/internal/x509_vfy.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/internal/x509_vfy.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/internal/x509_vfy.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/internal/x509_vfy.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/openssl/ssl.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/openssl/ssl.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/openssl/ssl.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/openssl/ssl.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_pm.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/platform/ssl_pm.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/platform/ssl_pm.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/platform/ssl_pm.h diff --git a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h b/thirdparty/libwebsockets/mbedtls_wrapper/include/platform/ssl_port.h similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h rename to thirdparty/libwebsockets/mbedtls_wrapper/include/platform/ssl_port.h diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_cert.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_cert.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_cert.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_cert.c diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_lib.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_lib.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_lib.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_lib.c diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_methods.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_methods.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_methods.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_methods.c diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_pkey.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_pkey.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_pkey.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_pkey.c diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_stack.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_stack.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_stack.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_stack.c diff --git a/thirdparty/lws/mbedtls_wrapper/library/ssl_x509.c b/thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_x509.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/library/ssl_x509.c rename to thirdparty/libwebsockets/mbedtls_wrapper/library/ssl_x509.c diff --git a/thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/platform/ssl_pm.c rename to thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_pm.c diff --git a/thirdparty/lws/mbedtls_wrapper/platform/ssl_port.c b/thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_port.c similarity index 100% rename from thirdparty/lws/mbedtls_wrapper/platform/ssl_port.c rename to thirdparty/libwebsockets/mbedtls_wrapper/platform/ssl_port.c diff --git a/thirdparty/lws/misc/base64-decode.c b/thirdparty/libwebsockets/misc/base64-decode.c similarity index 100% rename from thirdparty/lws/misc/base64-decode.c rename to thirdparty/libwebsockets/misc/base64-decode.c diff --git a/thirdparty/lws/misc/getifaddrs.c b/thirdparty/libwebsockets/misc/getifaddrs.c similarity index 100% rename from thirdparty/lws/misc/getifaddrs.c rename to thirdparty/libwebsockets/misc/getifaddrs.c diff --git a/thirdparty/lws/misc/getifaddrs.h b/thirdparty/libwebsockets/misc/getifaddrs.h similarity index 100% rename from thirdparty/lws/misc/getifaddrs.h rename to thirdparty/libwebsockets/misc/getifaddrs.h diff --git a/thirdparty/lws/misc/lejp.c b/thirdparty/libwebsockets/misc/lejp.c similarity index 100% rename from thirdparty/lws/misc/lejp.c rename to thirdparty/libwebsockets/misc/lejp.c diff --git a/thirdparty/lws/misc/lejp.h b/thirdparty/libwebsockets/misc/lejp.h similarity index 100% rename from thirdparty/lws/misc/lejp.h rename to thirdparty/libwebsockets/misc/lejp.h diff --git a/thirdparty/lws/misc/sha-1.c b/thirdparty/libwebsockets/misc/sha-1.c similarity index 100% rename from thirdparty/lws/misc/sha-1.c rename to thirdparty/libwebsockets/misc/sha-1.c diff --git a/thirdparty/lws/output.c b/thirdparty/libwebsockets/output.c similarity index 100% rename from thirdparty/lws/output.c rename to thirdparty/libwebsockets/output.c diff --git a/thirdparty/lws/plat/lws-plat-unix.c b/thirdparty/libwebsockets/plat/lws-plat-unix.c similarity index 100% rename from thirdparty/lws/plat/lws-plat-unix.c rename to thirdparty/libwebsockets/plat/lws-plat-unix.c diff --git a/thirdparty/lws/plat/lws-plat-win.c b/thirdparty/libwebsockets/plat/lws-plat-win.c similarity index 100% rename from thirdparty/lws/plat/lws-plat-win.c rename to thirdparty/libwebsockets/plat/lws-plat-win.c diff --git a/thirdparty/lws/pollfd.c b/thirdparty/libwebsockets/pollfd.c similarity index 100% rename from thirdparty/lws/pollfd.c rename to thirdparty/libwebsockets/pollfd.c diff --git a/thirdparty/lws/private-libwebsockets.h b/thirdparty/libwebsockets/private-libwebsockets.h similarity index 100% rename from thirdparty/lws/private-libwebsockets.h rename to thirdparty/libwebsockets/private-libwebsockets.h diff --git a/thirdparty/lws/server/fops-zip.c b/thirdparty/libwebsockets/server/fops-zip.c similarity index 100% rename from thirdparty/lws/server/fops-zip.c rename to thirdparty/libwebsockets/server/fops-zip.c diff --git a/thirdparty/lws/server/lejp-conf.c b/thirdparty/libwebsockets/server/lejp-conf.c similarity index 100% rename from thirdparty/lws/server/lejp-conf.c rename to thirdparty/libwebsockets/server/lejp-conf.c diff --git a/thirdparty/lws/server/parsers.c b/thirdparty/libwebsockets/server/parsers.c similarity index 100% rename from thirdparty/lws/server/parsers.c rename to thirdparty/libwebsockets/server/parsers.c diff --git a/thirdparty/lws/server/ranges.c b/thirdparty/libwebsockets/server/ranges.c similarity index 100% rename from thirdparty/lws/server/ranges.c rename to thirdparty/libwebsockets/server/ranges.c diff --git a/thirdparty/lws/server/server-handshake.c b/thirdparty/libwebsockets/server/server-handshake.c similarity index 100% rename from thirdparty/lws/server/server-handshake.c rename to thirdparty/libwebsockets/server/server-handshake.c diff --git a/thirdparty/lws/server/server.c b/thirdparty/libwebsockets/server/server.c similarity index 100% rename from thirdparty/lws/server/server.c rename to thirdparty/libwebsockets/server/server.c diff --git a/thirdparty/lws/server/ssl-server.c b/thirdparty/libwebsockets/server/ssl-server.c similarity index 100% rename from thirdparty/lws/server/ssl-server.c rename to thirdparty/libwebsockets/server/ssl-server.c diff --git a/thirdparty/lws/service.c b/thirdparty/libwebsockets/service.c similarity index 100% rename from thirdparty/lws/service.c rename to thirdparty/libwebsockets/service.c diff --git a/thirdparty/lws/ssl.c b/thirdparty/libwebsockets/ssl.c similarity index 100% rename from thirdparty/lws/ssl.c rename to thirdparty/libwebsockets/ssl.c diff --git a/thirdparty/lws/win32helpers/getopt.c b/thirdparty/libwebsockets/win32helpers/getopt.c similarity index 100% rename from thirdparty/lws/win32helpers/getopt.c rename to thirdparty/libwebsockets/win32helpers/getopt.c diff --git a/thirdparty/lws/win32helpers/getopt.h b/thirdparty/libwebsockets/win32helpers/getopt.h similarity index 100% rename from thirdparty/lws/win32helpers/getopt.h rename to thirdparty/libwebsockets/win32helpers/getopt.h diff --git a/thirdparty/lws/win32helpers/getopt_long.c b/thirdparty/libwebsockets/win32helpers/getopt_long.c similarity index 100% rename from thirdparty/lws/win32helpers/getopt_long.c rename to thirdparty/libwebsockets/win32helpers/getopt_long.c diff --git a/thirdparty/lws/win32helpers/gettimeofday.c b/thirdparty/libwebsockets/win32helpers/gettimeofday.c similarity index 100% rename from thirdparty/lws/win32helpers/gettimeofday.c rename to thirdparty/libwebsockets/win32helpers/gettimeofday.c diff --git a/thirdparty/lws/win32helpers/gettimeofday.h b/thirdparty/libwebsockets/win32helpers/gettimeofday.h similarity index 100% rename from thirdparty/lws/win32helpers/gettimeofday.h rename to thirdparty/libwebsockets/win32helpers/gettimeofday.h diff --git a/thirdparty/mbedtls/LICENSE b/thirdparty/mbedtls/LICENSE new file mode 100644 index 00000000000..546a8e631f5 --- /dev/null +++ b/thirdparty/mbedtls/LICENSE @@ -0,0 +1,2 @@ +Unless specifically indicated otherwise in a file, files are licensed +under the Apache 2.0 license, as can be found in: apache-2.0.txt diff --git a/thirdparty/mbedtls/apache-2.0.txt b/thirdparty/mbedtls/apache-2.0.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/thirdparty/mbedtls/apache-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.