Skip to content

Commit

Permalink
Harmonize copyright date and statements across various files
Browse files Browse the repository at this point in the history
  • Loading branch information
idrassi committed Oct 5, 2023
1 parent 42857b4 commit 22ac25d
Show file tree
Hide file tree
Showing 8 changed files with 185 additions and 19 deletions.
12 changes: 12 additions & 0 deletions License.txt
Original file line number Diff line number Diff line change
Expand Up @@ -807,3 +807,15 @@ 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
____________________________________________________________
Copyright (c) 1999-2023 Igor Pavlov

LZMA SDK is written and placed in the public domain by Igor Pavlov.

Some code in LZMA SDK is based on public domain code from another developers:
1) PPMd var.H (2001): Dmitry Shkarin
2) SHA-256: Wei Dai (Crypto++ library)

Anyone is free to copy, modify, publish, use, compile, sell, or distribute the
original LZMA SDK code, either in source code form or as a compiled binary, for
any purpose, commercial or non-commercial, and by any means.
____________________________________________________________
Binary file modified doc/chm/VeraCrypt User Guide.chm
Binary file not shown.
6 changes: 3 additions & 3 deletions doc/html/Legal Information.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ <h3>Copyright Information</h3>
<p>Copyright &copy; 1998-2000 Paul Le Roux. All rights reserved.<br>
<br>
Copyright &copy; 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.</p>
<p>Copyright &copy; 1995-2017 Jean-loup Gailly and Mark Adler.</p>
<p>Copyright &copy; 1995-2023 Jean-loup Gailly and Mark Adler.</p>
<p>Copyright &copy; 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov</p>
<p>Copyright &copy; 1999-2020 Dieter Baron and Thomas Klausner.</p>
<p>Copyright &copy; 1999-2023 Dieter Baron and Thomas Klausner.</p>
<p>Copyright &copy; 2013, Alexey Degtyarev. All rights reserved.</p>
<p>Copyright &copy; 1999-2016 Jack Lloyd. All rights reserved.</p>
<p>Copyright &copy; 2013-2019 Stephan Mueller &lt;[email protected]&gt;</p>
<p>Copyright &copy; 1999-2021 Igor Pavlov.</p>
<p>Copyright &copy; 1999-2023 Igor Pavlov.</p>
<br>
For more information, please see the legal notices attached to parts of the source code.</p>
<h3>Trademark Information</h3>
Expand Down
22 changes: 19 additions & 3 deletions doc/html/VeraCrypt License.html
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ <h1><strong style="text-align:left">VeraCrypt License</strong></h1>
This software is provided 'as is' with no explicit or implied warranties in respect of its properties, including, but not limited to, correctness and/or fitness for purpose.<br style="text-align:left">
____________________________________________________________<br>
<br>
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler.<br>
Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler.<br>
<br>
This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.<br>
<br>
Expand All @@ -365,7 +365,7 @@ <h1><strong style="text-align:left">VeraCrypt License</strong></h1>
[email protected] [email protected]<br>
____________________________________________________________<br>
<br>
Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner<br>
Copyright (C) 1999-2023 Dieter Baron and Thomas Klausner<br>
<br>
The authors can be contacted at <libzip@nih.at><br>
<br>
Expand Down Expand Up @@ -405,7 +405,7 @@ <h1><strong style="text-align:left">VeraCrypt License</strong></h1>
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.<br>
____________________________________________________________<br>
<br>
Copyright (c) 2013-2018 Stephan Mueller &lt;[email protected]&gt;<br>
Copyright (c) 2013-2019 Stephan Mueller &lt;[email protected]&gt;<br>
<br>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
<ol>
Expand All @@ -420,5 +420,21 @@ <h1><strong style="text-align:left">VeraCrypt License</strong></h1>
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</p>
____________________________________________________________<br>
<br>
Copyright (c) 1999-2023 Igor Pavlov<br>
<br>
LZMA SDK is written and placed in the public domain by Igor Pavlov.<br>
<br>
Some code in LZMA SDK is based on public domain code from another developers:<br>
<ol>
<li> PPMd var.H (2001): Dmitry Shkarin</li>
<li> SHA-256: Wei Dai (Crypto++ library)</li>
</ol>
<p>
Anyone is free to copy, modify, publish, use, compile, sell, or distribute the <br>
original LZMA SDK code, either in source code form or as a compiled binary, for <br>
any purpose, commercial or non-commercial, and by any means.
</p>
____________________________________________________________<br>
</div>
</body></html>
22 changes: 19 additions & 3 deletions doc/html/ru/VeraCrypt License.html
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ <h1><strong style="text-align:left">Лицензия VeraCrypt</strong></h1>
This software is provided 'as is' with no explicit or implied warranties in respect of its properties, including, but not limited to, correctness and/or fitness for purpose.<br style="text-align:left">
____________________________________________________________<br>
<br>
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler.<br>
Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler.<br>
<br>
This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.<br>
<br>
Expand All @@ -367,7 +367,7 @@ <h1><strong style="text-align:left">Лицензия VeraCrypt</strong></h1>
[email protected] [email protected]<br>
____________________________________________________________<br>
<br>
Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner<br>
Copyright (C) 1999-2023 Dieter Baron and Thomas Klausner<br>
<br>
The authors can be contacted at <libzip@nih.at><br>
<br>
Expand Down Expand Up @@ -407,7 +407,7 @@ <h1><strong style="text-align:left">Лицензия VeraCrypt</strong></h1>
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.<br>
____________________________________________________________<br>
<br>
Copyright (c) 2013-2018 Stephan Mueller &lt;[email protected]&gt;<br>
Copyright (c) 2013-2019 Stephan Mueller &lt;[email protected]&gt;<br>
<br>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
<ol>
Expand All @@ -422,5 +422,21 @@ <h1><strong style="text-align:left">Лицензия VeraCrypt</strong></h1>
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</p>
____________________________________________________________<br>
<br>
Copyright (c) 1999-2023 Igor Pavlov<br>
<br>
LZMA SDK is written and placed in the public domain by Igor Pavlov.<br>
<br>
Some code in LZMA SDK is based on public domain code from another developers:<br>
<ol>
<li> PPMd var.H (2001): Dmitry Shkarin</li>
<li> SHA-256: Wei Dai (Crypto++ library)</li>
</ol>
<p>
Anyone is free to copy, modify, publish, use, compile, sell, or distribute the <br>
original LZMA SDK code, either in source code form or as a compiled binary, for <br>
any purpose, commercial or non-commercial, and by any means.
</p>
____________________________________________________________<br>
</div>
</body></html>
36 changes: 34 additions & 2 deletions src/License.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
This software is provided 'as is' with no explicit or implied warranties in respect of its properties, including, but not limited to, correctness and/or fitness for purpose.<br>
____________________________________________________________<br>
<br>
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler.<br>
Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler.<br>
<br>
This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages arising from the use of this software.<br>
<br>
Expand All @@ -177,7 +177,7 @@
[email protected] [email protected]<br>
____________________________________________________________<br>
<br>
Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner<br>
Copyright (C) 1999-2023 Dieter Baron and Thomas Klausner<br>
<br>
The authors can be contacted at <libzip@nih.at><br>
<br>
Expand Down Expand Up @@ -216,5 +216,37 @@
<br>
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.<br>
____________________________________________________________<br>
<br>
Copyright (c) 2013-2019 Stephan Mueller &lt;[email protected]&gt;<br>
<br>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
<ol>
<li>Redistributions of source code must retain the above copyright notice, and the entire permission notice in its entirety, including the disclaimer of warranties.</li>
<li>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.</li>
<li>The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.</li>
</ol>
<p>
ALTERNATIVELY, this product may be distributed under the terms of the GNU General Public License, in which case the provisions of the GPL2 are required INSTEAD OF the above restrictions. (This clause is necessary due to a potential bad interaction between the GPL and the restrictions contained in a BSD-style copyright.)
</p>
<p>
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</p>
____________________________________________________________<br>
<br>
Copyright (c) 1999-2023 Igor Pavlov<br>
<br>
LZMA SDK is written and placed in the public domain by Igor Pavlov.<br>
<br>
Some code in LZMA SDK is based on public domain code from another developers:<br>
<ol>
<li> PPMd var.H (2001): Dmitry Shkarin</li>
<li> SHA-256: Wei Dai (Crypto++ library)</li>
</ol>
<p>
Anyone is free to copy, modify, publish, use, compile, sell, or distribute the <br>
original LZMA SDK code, either in source code form or as a compiled binary, for <br>
any purpose, commercial or non-commercial, and by any means.
</p>
____________________________________________________________<br>
</body>
</html>
53 changes: 49 additions & 4 deletions src/License.txt
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ warranties in respect of its properties, including, but not
limited to, correctness and/or fitness for purpose.
____________________________________________________________

Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand All @@ -700,7 +700,7 @@ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Jean-loup Gailly Mark Adler
[email protected] [email protected]
____________________________________________________________
Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
Copyright (C) 1999-2023 Dieter Baron and Thomas Klausner

The authors can be contacted at <[email protected]>

Expand Down Expand Up @@ -770,7 +770,52 @@ 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.
____________________________________________________________
LZMA SDK Copyright (C) 1999-2021 Igor Pavlov
Copyright (c) 2013-2019 Stephan Mueller <[email protected]>

Public domain
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, and the entire permission notice in its entirety,
including the disclaimer of warranties.

2. 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.

3. The name of the author may not be used to endorse or promote
products derived from this software without specific prior
written permission.

ALTERNATIVELY, this product may be distributed under the terms of
the GNU General Public License, in which case the provisions of the
GPL2 are required INSTEAD OF the above restrictions. (This clause is
necessary due to a potential bad interaction between the GPL and the
restrictions contained in a BSD-style copyright.)

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH
ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
____________________________________________________________
Copyright (c) 1999-2023 Igor Pavlov

LZMA SDK is written and placed in the public domain by Igor Pavlov.

Some code in LZMA SDK is based on public domain code from another developers:
1) PPMd var.H (2001): Dmitry Shkarin
2) SHA-256: Wei Dai (Crypto++ library)

Anyone is free to copy, modify, publish, use, compile, sell, or distribute the
original LZMA SDK code, either in source code form or as a compiled binary, for
any purpose, commercial or non-commercial, and by any means.
____________________________________________________________
Loading

0 comments on commit 22ac25d

Please sign in to comment.