[PATCH] block-sha1: Use mozilla-sha1 copyright and license information

[PATCH] block-sha1: Use mozilla-sha1 copyright and license information

[Ulrik Sverdrup]

block-sha1 needs an independent copyright and license header, in the
case that the original mozilla SHA-1 implementation is removed from
the tree.

The Contributor(s) list in the header is not in the git style, but
it is copied as well, and augmented with git contributors to
block-sha1.

Signed-off-by: Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
---

block-sha1/sha1.{ch} simply say this:

/*
 * Based on the Mozilla SHA1 (see mozilla-sha1/sha1.c),
 * optimized to do word accesses rather than byte accesses,
 * and to avoid unnecessary copies into the context array.
 */

This means that if mozilla-sha1 is removed, we need to copy the
license information back to block-sha1.


 block-sha1/sha1.c |   38 +++++++++++++++++++++++++++++++++++++-
 block-sha1/sha1.h |   37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index 464cb25..34c7415 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -1,5 +1,41 @@
 /*
- * Based on the Mozilla SHA1 (see mozilla-sha1/sha1.c),
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is SHA 180-1 Reference Implementation (Compact version)
+ *
+ * The Initial Developer of the Original Code is Paul Kocher of
+ * Cryptography Research.  Portions created by Paul Kocher are
+ * Copyright (C) 1995-9 by Cryptography Research, Inc.  All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *     Paul Kocher
+ *     Linus Torvalds
+ *     Nicolas Pitre
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+/*
+ * Based on the Mozilla SHA1, this implementation is
  * optimized to do word accesses rather than byte accesses,
  * and to avoid unnecessary copies into the context array.
  */
diff --git a/block-sha1/sha1.h b/block-sha1/sha1.h
index c1ae74d..dc72ccf 100644
--- a/block-sha1/sha1.h
+++ b/block-sha1/sha1.h
@@ -1,7 +1,38 @@
 /*
- * Based on the Mozilla SHA1 (see mozilla-sha1/sha1.h),
- * optimized to do word accesses rather than byte accesses,
- * and to avoid unnecessary copies into the context array.
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is SHA 180-1 Header File
+ *
+ * The Initial Developer of the Original Code is Paul Kocher of
+ * Cryptography Research.  Portions created by Paul Kocher are
+ * Copyright (C) 1995-9 by Cryptography Research, Inc.  All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *     Paul Kocher
+ *     Linus Torvalds
+ *     Nicolas Pitre
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable
+ * instead of those above.  If you wish to allow use of your
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
  */
 
 typedef struct {
-- 
1.6.4

Re: [PATCH] block-sha1: Use mozilla-sha1 copyright and license information

[Nicolas Pitre]

On Mon, 24 Aug 2009, Ulrik Sverdrup wrote:

> block-sha1 needs an independent copyright and license header, in the
> case that the original mozilla SHA-1 implementation is removed from
> the tree.

The Mozilla SHA1 is already removed from the tree in "next", and 
block-sha1/sha1.c header modified accordingly.

As there is nothing remaining from the Mozilla SHA1 code, I don't think 
copying that Mozilla License block verbatim is appropriate.  As Linus 
has put it himself, the Mozilla SHA1 code was more inspirational than 
anything else.

And even if some license claim could be made, the MPL section was 
deleted anyway (as explicitly allowed), meaning that only the GPL (by 
vertu of being included in a GPL project) would then apply.

A question was recently sent to all contributors (see the mail 
archive) to determine if they 
would agree 
to a relicensing of that code to make wider license compatibility.  
George Spelvin even rewrote that code as well with the goal of 
putting his version in the public domain.  No definitive conclusion 
emerged so far though.

Therefore I don't think this patch is appropriate.


Nicolas

Re: [PATCH] block-sha1: Use mozilla-sha1 copyright and license information

[Ulrik Sverdrup]

2009/8/24 Nicolas Pitre <nico@cam.org>:
>
> The Mozilla SHA1 is already removed from the tree in "next", and
> block-sha1/sha1.c header modified accordingly.
>
> As there is nothing remaining from the Mozilla SHA1 code, I don't think
> copying that Mozilla License block verbatim is appropriate.  As Linus
> has put it himself, the Mozilla SHA1 code was more inspirational than
> anything else.
>
> And even if some license claim could be made, the MPL section was
> deleted anyway (as explicitly allowed), meaning that only the GPL (by
> vertu of being included in a GPL project) would then apply.
>
> A question was recently sent to all contributors (see the mail
> archive) to determine if they
> would agree
> to a relicensing of that code to make wider license compatibility.
> George Spelvin even rewrote that code as well with the goal of
> putting his version in the public domain.  No definitive conclusion
> emerged so far though.
>
> Therefore I don't think this patch is appropriate.

Agreed. I just didn't look into next.

Ulrik