From 81bdbff1d1948966bfdb7af9e2e403225617a6d4 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Wed, 14 Dec 2016 00:00:31 +0000 Subject: [PATCH] update readme and license for crypto++ --- LICENSE.md | 80 ++++++++++++++---------------------------------------- README.md | 2 +- 2 files changed, 22 insertions(+), 60 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 7d1f1995..0ab3737f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -26,7 +26,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Third-party licenses ==================== - Pole is distributed under the BSD 2-Clause License ================================================== @@ -55,67 +54,30 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Botan is distributed under the BSD 2-Clause License -=================================================== +Crypto++ is distributed under the Boost Software License - Version 1.0 +====================================================================== -Copyright (C) 1999-2013,2014,2015,2016 Jack Lloyd - 2001 Peter J Jones - 2004-2007 Justin Karneges - 2004 Vaclav Ovsik - 2005 Matthew Gregan - 2005-2006 Matt Johnston - 2006 Luca Piccarreta - 2007 Yves Jerschow - 2007,2008 FlexSecure GmbH - 2007,2008 Technische Universitat Darmstadt - 2007,2008,2010,2014 Falko Strenzke - 2007,2008 Martin Doering - 2007 Manuel Hartl - 2007 Christoph Ludwig - 2007 Patrick Sona - 2008 Copyright Projet SECRET, INRIA, Rocquencourt - 2008 Bhaskar Biswas and Nicolas Sendrier - 2008 Google Inc. - 2010 Olivier de Gaalon - 2012 Vojtech Kral - 2012,2014 Markus Wanner - 2013 Joel Low - 2014 cryptosource GmbH - 2014 Andrew Moon - 2015 Daniel Seither (Kullo GmbH) - 2015 Simon Warta (Kullo GmbH) - 2015 Matej Kenda (TopIT d.o.o.) - 2015 René Korthaus - 2015,2016 Daniel Neus - 2015 Uri Blumenthal - 2015,2016 Kai Michaelis - 2016 Simon Cogliani - 2015,2016 Rohde & Schwarz Cybersecurity - 2016 Juraj Somorovsky - 2016 Christian Mainka -All rights reserved. +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: -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +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. -1. Redistributions of source code must retain the above copyright notice, - this list of conditions, and the following disclaimer. - -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. - -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. +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. libstudxml is distributed under the MIT License diff --git a/README.md b/README.md index 9fd0540e..4d84388d 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ xlnt requires the following libraries which are all distributed under permissive - [zlib v1.2.8](http://zlib.net/) (zlib License) - [libstudxml v1.1.0](http://www.codesynthesis.com/projects/libstudxml/) (MIT license) - [utfcpp v2.3.4](http://utfcpp.sourceforge.net/) (Boost Software License, Version 1.0) -- [botan v1.11](https://botan.randombit.net/) (BSD 2-Clause License) +- [Crypto++ v5.6.5](https://www.cryptopp.com/) (Boost Software License, Version 1.0) - [pole v0.5](https://github.com/catlan/pole) (BSD 2-Clause License) - [partio v1.1.0](https://github.com/wdas/partio) (BSD 3-Clause License with specific non-attribution clause)