public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephan Mueller <smueller@chronox.de>
To: Paul Bolle <pebolle@tiscali.nl>
Cc: herbert@gondor.apana.org.au,
	Andreas Steffen <andreas.steffen@strongswan.org>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Sandy Harris <sandyinchina@gmail.com>,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 6/6] crypto: add jitterentropy RNG
Date: Thu, 23 Apr 2015 16:08:14 +0200	[thread overview]
Message-ID: <3179693.vMYTrm5f8Q@myon.chronox.de> (raw)
In-Reply-To: <1429797908.2927.5.camel@x220>

Am Donnerstag, 23. April 2015, 16:05:08 schrieb Paul Bolle:

Hi Paul,

> A nit only, I'm afraid: this patch adds a license mismatch.
> 
> On Wed, 2015-04-22 at 21:25 +0200, Stephan Mueller wrote:
> > --- /dev/null
> > +++ b/crypto/jitterentropy.c
> > 
> > + * License
> > + * =======
> > + *
> > + * 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.
> > + */
> 
> This states the license is BSD or GPL v2.
> 
> > +MODULE_LICENSE("GPL");
> 
> And, according to inlude/linux/module.h, using
>     MODULE_LICENSE("Dual BSD/GPL");
> 
> here would match that statement.
> 
Thanks for the hint. Other patches that are in the kernel that I wrote (e.g. 
the crypto/drbg.c) have the same license as above, but use 
MODULE_LICENSE("GPL") -- Thus I would think that leaving it as is should be 
ok.

> 
> Paul Bolle


-- 
Ciao
Stephan

  reply	other threads:[~2015-04-23 14:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-22 19:16 [PATCH 0/6] Seeding DRBG with more entropy Stephan Mueller
2015-04-22 19:18 ` [PATCH 1/6] random: Addition of kernel_pool Stephan Mueller
2015-04-22 19:19 ` [PATCH 2/6] random: Async and sync API for accessing kernel_pool Stephan Mueller
2015-04-22 19:20 ` [PATCH 3/6] crypto: drbg - prepare for async seeding Stephan Mueller
2015-04-22 19:24 ` [PATCH 4/6] crypto: drbg - add async seeding operation Stephan Mueller
2015-04-22 19:24 ` [PATCH 5/6] crypto: drbg - use Jitter RNG to obtain seed Stephan Mueller
2015-04-22 19:25 ` [PATCH 6/6] crypto: add jitterentropy RNG Stephan Mueller
2015-04-23 14:05   ` Paul Bolle
2015-04-23 14:08     ` Stephan Mueller [this message]
2015-04-23 14:18       ` Paul Bolle
2015-04-23 14:26         ` Stephan Mueller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3179693.vMYTrm5f8Q@myon.chronox.de \
    --to=smueller@chronox.de \
    --cc=andreas.steffen@strongswan.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pebolle@tiscali.nl \
    --cc=sandyinchina@gmail.com \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox