summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2015-12-31 15:44:45 +0100
committerMichael Brown2015-12-31 15:44:45 +0100
commit0c396dd4052732da751249e5057425adb0692db2 (patch)
tree1bcaac6a254d69cf03f0d87b9024d3fd603d3eed
parent[smsc95xx] Allow for multiple methods for obtaining the MAC address (diff)
downloadipxe-0c396dd4052732da751249e5057425adb0692db2.tar.gz
ipxe-0c396dd4052732da751249e5057425adb0692db2.tar.xz
ipxe-0c396dd4052732da751249e5057425adb0692db2.zip
[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>
-rw-r--r--src/crypto/drbg.c12
-rw-r--r--src/crypto/hash_df.c12
-rw-r--r--src/crypto/hmac_drbg.c12
-rw-r--r--src/crypto/rbg.c12
4 files changed, 48 insertions, 0 deletions
diff --git a/src/crypto/drbg.c b/src/crypto/drbg.c
index 5c8b5e61..a3366e80 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 c1417e68..dc0dc0ce 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 6c1d5deb..09829771 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 943b288c..a5a77e3c 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 );