From: Michael Brown <mcb30@ipxe.org>
Date: Thu, 31 Dec 2015 14:44:45 +0000 (+0000)
Subject: [crypto] Dual-license selected DRBG files
X-Git-Tag: v1.20.1~644
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c396dd4052732da751249e5057425adb0692db2;p=thirdparty%2Fipxe.git

[crypto] Dual-license selected DRBG files

Allow the use of the iPXE DRBG implementation in BSD-licensed
projects.

Requested-by: Sean Davis <dive@hq.endersgame.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/crypto/drbg.c b/src/crypto/drbg.c
index 5c8b5e612..a3366e806 100644
--- a/src/crypto/drbg.c
+++ b/src/crypto/drbg.c
@@ -19,6 +19,18 @@
  * You can also choose to distribute this program under the terms of
  * the Unmodified Binary Distribution Licence (as given in the file
  * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
+ * Alternatively, you may distribute this code in source or binary
+ * form, with or without modification, provided that the following
+ * conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the above disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the above
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
diff --git a/src/crypto/hash_df.c b/src/crypto/hash_df.c
index c1417e683..dc0dc0ce8 100644
--- a/src/crypto/hash_df.c
+++ b/src/crypto/hash_df.c
@@ -19,6 +19,18 @@
  * You can also choose to distribute this program under the terms of
  * the Unmodified Binary Distribution Licence (as given in the file
  * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
+ * Alternatively, you may distribute this code in source or binary
+ * form, with or without modification, provided that the following
+ * conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the above disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the above
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
diff --git a/src/crypto/hmac_drbg.c b/src/crypto/hmac_drbg.c
index 6c1d5deb2..098297716 100644
--- a/src/crypto/hmac_drbg.c
+++ b/src/crypto/hmac_drbg.c
@@ -19,6 +19,18 @@
  * You can also choose to distribute this program under the terms of
  * the Unmodified Binary Distribution Licence (as given in the file
  * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
+ * Alternatively, you may distribute this code in source or binary
+ * form, with or without modification, provided that the following
+ * conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the above disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the above
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
diff --git a/src/crypto/rbg.c b/src/crypto/rbg.c
index 943b288c3..a5a77e3cd 100644
--- a/src/crypto/rbg.c
+++ b/src/crypto/rbg.c
@@ -19,6 +19,18 @@
  * You can also choose to distribute this program under the terms of
  * the Unmodified Binary Distribution Licence (as given in the file
  * COPYING.UBDL), provided that you have satisfied its requirements.
+ *
+ * Alternatively, you may distribute this code in source or binary
+ * form, with or without modification, provided that the following
+ * conditions are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the above disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the above
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
  */
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );