readlicense_oo/license/license.xml |   73 -------------------------------------
 1 file changed, 1 insertion(+), 72 deletions(-)

New commits:
commit 62d3da841b402f7cc9421d87f3f1db714b278d40
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Feb 26 23:04:54 2023 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Feb 27 13:43:16 2023 +0000

    OpenSSL 3 is covered by Apache License v2
    
    Change-Id: I20b30ce01b08787f560cd00cd87db9cec1699240
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147746
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index e753c743f8c6..b9071aa23837 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1525,78 +1525,7 @@
         <h2>OpenSSL</h2>
         <p>The following software may be included in this product: OpenSSL. 
Use of any of this software is governed by
         the terms of the license below:</p>
-        <p>The OpenSSL toolkit stays under a dual license, i.e. both the 
conditions of the OpenSSL License and the
-        original SSLeay license apply to the toolkit.</p>
-        <p>See below for the actual license texts. Actually both licenses are 
BSD-style Open Source licenses. In case
-        of any license issues related to OpenSSL please contact 
openssl-c...@openssl.org.</p>
-        <h3>OpenSSL License</h3>
-        <p>Copyright (c) 1998-2007 The OpenSSL Project. All rights 
reserved.</p>
-        <p>Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that
-        the following conditions are met:</p>
-        <ol>
-            <li>Redistribution of source code must retain the above copyright 
notice, this list of conditions and the
-            following disclaimer.</li>
-            <li>Redistribution 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. </li>
-            <li>All advertising materials mentioning features or use of this 
software must display the following
-            acknowledgment: "This product includes software developed by the 
OpenSSL Project for use in the OpenSSL
-            Toolkit. (<a 
href="http://www.openssl.org/";>http://www.openssl.org/</a>)" </li>
-            <li>The names "OpenSSL Toolkit" and "OpenSSL Project" must not be 
used to endorse or promote products
-            derived from this software without prior written permission. For 
written permission, please contact
-            openssl-c...@openssl.org. </li>
-            <li>Products derived from this software may not be called 
"OpenSSL" nor may "OpenSSL" appear in their names
-            without prior written permission of the OpenSSL Project. </li>
-            <li>Redistribution of any form whatsoever must retain the 
following acknowledgment: "This product includes
-            software developed by the OpenSSL Project for use in the OpenSSL 
Toolkit (<a href=
-            "http://www.openssl.org/";>http://www.openssl.org/</a>)" </li>
-        </ol>
-        <p>THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY 
EXPRESSED 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 OpenSSL PROJECT OR ITS 
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.</p>
-        <p>This product includes cryptographic software written by Eric Young 
(e...@cryptsoft.com). This product
-        includes software written by Tim Hudson (t...@cryptsoft.com).</p>
-        <h3>Original SSLeay License</h3>
-        <p>Copyright (C) 1995-1998 Eric Young (e...@cryptsoft.com) All rights 
reserved.</p>
-        <p>This package is an SSL implementation written by Eric Young (<a 
href=
-        "mailto:e...@cryptsoft.com";>e...@cryptsoft.com</a>).<br />
-        The implementation was written so as to conform with Netscapes SSL.</p>
-        <p>This library is free for commercial and non-commercial use as long 
as the following conditions are aheared
-        to. The following conditions apply to all code found in this 
distribution, be it the RC4, RSA, lhash, DES,
-        etc., code; not just the SSL code. The SSL documentation included with 
this distribution is covered by the same
-        copyright terms except that the holder is Tim Hudson 
(t...@cryptsoft.com).</p>
-        <p>Copyright remains Eric Young's, and as such any Copyright notices 
in the code are not to be removed. If this
-        package is used in a product, Eric Young should be given attribution 
as the author of the parts of the library
-        used. This can be in the form of a textual message at program startup 
or in documentation (online or textual)
-        provided with the package.</p>
-        <p>Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that
-        the following conditions are met:</p>
-        <ol>
-            <li>Redistribution of source code must retain the copyright 
notice, this list of conditions and the
-            following disclaimer.</li>
-            <li>Redistribution 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. </li>
-            <li>All advertising materials mentioning features or use of this 
software must display the following
-            acknowledgment: "This product includes cryptographic software 
written by Eric Young (e...@cryptsoft.com)"
-            The word 'cryptographic' can be left out if the routines from the 
library being used are not cryptographic
-            related :-). </li>
-            <li>If you include any Windows specific code (or a derivative 
thereof) from the apps directory (application
-            code) you must include an acknowledgment: "This product includes 
software written by Tim Hudson
-            (t...@cryptsoft.com)" </li>
-        </ol>
-        <p>THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.</p>
-        <p>The license and distribution terms for any publicly available 
version or derivative of this code cannot be
-        changed. i.e. this code cannot simply be copied and put under another 
distribution license [including the GNU
-        Public License.]</p>
+        <p><a href="#a__Apache_License_version_2_0">Jump to Apache License 
Version 2.0</a></p>
     </div>
     <div class="PDFIUM">
         <h2>PDFium</h2>

Reply via email to