[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-438-g764643a
by Werner Koch
cvs at cvs.gnupg.org
Fri Dec 13 14:56:09 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".
The branch, master has been updated
via 764643a3d5634bcbc47790bd8505f6a1a5280d9c (commit)
via 413bfc4dd358be4728f856292e545fc67078fed8 (commit)
from e41d605ee41469e8a33cdc4d38f742cfb931f835 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 764643a3d5634bcbc47790bd8505f6a1a5280d9c
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 13 14:52:21 2013 +0100
Update license information
* LICENSES: New.
* Makefile.am (EXTRA_DIST): Add LICENSES.
* AUTHORS: Add list of copyright holders.
* README: Reference AUTHORS.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/AUTHORS b/AUTHORS
index fcc992c..dc933dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,8 +6,32 @@ Security related bug reports: <security at gnupg.org>
License (library): LGPLv2.1+
License (manual and tools): GPLv2+
-Libgcrypt used to be part of GnuPG but has been taken out into its own
-package on 2000-12-21.
+Libgcrypt is free software. See the files COPYING.LIB and COPYING for
+copying conditions, and LICENSES for notices about a few contributions
+that require these additional notices to be distributed. License
+copyright years may be listed using range notation, e.g., 2000-2013,
+indicating that every year in the range, inclusive, is a copyrightable
+year that would otherwise be listed individually.
+
+
+List of Copyright holders
+=========================
+
+ Copyright (C) 1989,1991-2012 Free Software Foundation, Inc.
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 1996 L. Peter Deutsch
+ Copyright (C) 1997 Werner Koch
+ Copyright (C) 1998 The Internet Society
+ Copyright (C) 1996-1999 Peter Gutmann, Paul Kendall, and Chris Wedgwood
+ Copyright (C) 1996-2006 Peter Gutmann, Matt Thomlinson and Blake Coverett
+ Copyright (C) 2003 Nikos Mavroyanopoulos
+ Copyright (C) 2006-2007 NTT (Nippon Telegraph and Telephone Corporation)
+ Copyright (C) 2012-2013 g10 Code GmbH
+ Copyright (C) 2012 Simon Josefsson, Niels Möller
+ Copyright (c) 2012 Intel Corporation
+ Copyright (C) 2013 Christian Grothoff
+ Copyright (C) 2013 Jussi Kivilinna
+ Copyright (C) 2013 Dmitry Eremin-Solenikov
Authors with a FSF copyright assignment
@@ -145,6 +169,10 @@ Werner Koch <wk at gnupg.org> (g10 Code GmbH)
More credits
============
+
+Libgcrypt used to be part of GnuPG but has been taken out into its own
+package on 2000-12-21.
+
The ATH implementation (src/ath*) has been taken from GPGME and
relicensed to the LGPL by the copyright holder of GPGME (g10 Code
GmbH); it is now considered to be a part of Libgcrypt.
@@ -168,7 +196,7 @@ It has a permissive license and is copyrighted by atsec information
security corporation. See the file for details.
The file salsa20.c is based on D.J. Bernstein's public domain code and
-taken from Nettle. Copyright 2007 Simon Josefsson and Niels Möller.
+taken from Nettle. Copyright 2012 Simon Josefsson and Niels Möller.
This file is free software; as a special exception the author gives
diff --git a/LICENSES b/LICENSES
new file mode 100644
index 0000000..8594cfd
--- /dev/null
+++ b/LICENSES
@@ -0,0 +1,134 @@
+Additional license notices for Libgcrypt. -*- org -*-
+
+This file contains the copying permission notices for various files in
+the Libgcrypt distribution which are not covered by the GNU Lesser
+General Public License (LGPL) or the GNU General Public License (GPL).
+
+These notices all require that a copy of the notice be included
+in the accompanying documentation and be distributed with binary
+distributions of the code, so be sure to include this file along
+with any binary distributions derived from the GNU C Library.
+
+* BSD_3Clause
+
+ For files:
+ - cipher/sha256-ssse3-amd64.S
+ - cipher/sha512-avx-amd64.S
+ - cipher/sha512-avx2-bmi2-amd64.S
+ - cipher/sha512-ssse3-amd64.S
+
+#+begin_quote
+ Copyright (c) 2012, Intel Corporation
+
+ All rights reserved.
+
+ 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 Intel Corporation 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 INTEL CORPORATION "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 INTEL CORPORATION 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.
+#+end_quote
+
+* Simple permissive licenses
+
+ For files:
+ - cipher/crc.c
+
+#+begin_quote
+ Copyright (c) 1996 L. Peter Deutsch
+
+ Permission is granted to copy and distribute this document for
+ any purpose and without charge, including translations into
+ other languages and incorporation into compilations, provided
+ that the copyright notice and this notice are preserved, and
+ that any substantive changes or deletions from the original are
+ clearly marked.
+#+end_quote
+
+* IETF permissive licenses
+
+ For files:
+ - cipher/crc.c
+
+#+begin_quote
+ Copyright (C) The Internet Society (1998). All Rights Reserved.
+
+ This document and translations of it may be copied and furnished
+ to others, and derivative works that comment on or otherwise
+ explain it or assist in its implementation may be prepared,
+ copied, published and distributed, in whole or in part, without
+ restriction of any kind, provided that the above copyright notice
+ and this paragraph are included on all such copies and derivative
+ works. However, this document itself may not be modified in any
+ way, such as by removing the copyright notice or references to
+ the Internet Society or other Internet organizations, except as
+ needed for the purpose of developing Internet standards in which
+ case the procedures for copyrights defined in the Internet
+ Standards process must be followed, or as required to translate
+ it into languages other than English.
+
+ The limited permissions granted above are perpetual and will not be
+ revoked by the Internet Society or its successors or assigns.
+
+ This document and the information contained herein is provided on
+ an "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET
+ ENGINEERING TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE
+ OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY
+ IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+ PURPOSE.
+#+end_quote
+
+* X License
+
+ For files:
+ - install.sh
+
+#+begin_quote
+ Copyright (C) 1994 X Consortium
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+#+end_quote
diff --git a/Makefile.am b/Makefile.am
index f1dbd09..7fb7b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ GITLOG_TO_CHANGELOG=gitlog-to-changelog
DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
SUBDIRS = compat mpi cipher random src doc tests
-EXTRA_DIST = autogen.sh README.GIT \
+EXTRA_DIST = autogen.sh README.GIT LICENSES \
ChangeLog-2011 scripts/ChangeLog-2011 doc/ChangeLog-2011 \
m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
diff --git a/README b/README
index 1778951..ff3ce9c 100644
--- a/README
+++ b/README
@@ -2,19 +2,11 @@
------------------------------------
Version 1.6
- !!! THIS IS A DEVELOPMENT VERSION VERSION !!!
-
- Copyright 2000, 2002, 2003, 2004, 2007, 2008, 2009,
- 2011, 2012 Free Software Foundation, Inc.
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ Copyright (C) 1989,1991-2012 Free Software Foundation, Inc.
+ Libgcrypt is free software. See the file AUTHORS for full copying
+ notices, and LICENSES for notices about contributions that require
+ these additional notices to be distributed.
Overview
commit 413bfc4dd358be4728f856292e545fc67078fed8
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 13 10:53:26 2013 +0100
doc: Minor manual fix.
--
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 410c45d..dc42950 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -4922,7 +4922,7 @@ may be used:
@deftypefun void gcry_mpi_randomize (@w{gcry_mpi_t @var{w}}, @w{unsigned int @var{nbits}}, @w{enum gcry_random_level @var{level}})
-Set the multi-precision-integers @var{w} to a random value of
+Set the multi-precision-integers @var{w} to a random non-negative number of
@var{nbits}, using random data quality of level @var{level}. In case
@var{nbits} is not a multiple of a byte, @var{nbits} is rounded up to
the next byte boundary. When using a @var{level} of
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 34 ++++++++++++--
LICENSES | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 2 +-
README | 16 ++-----
doc/gcrypt.texi | 2 +-
5 files changed, 171 insertions(+), 17 deletions(-)
create mode 100644 LICENSES
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits
More information about the Gcrypt-devel
mailing list