From 0c396dd4052732da751249e5057425adb0692db2 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 31 Dec 2015 14:44:45 +0000 Subject: [PATCH] [crypto] Dual-license selected DRBG files Allow the use of the iPXE DRBG implementation in BSD-licensed projects. Requested-by: Sean Davis Signed-off-by: Michael Brown --- src/crypto/drbg.c | 12 ++++++++++++ src/crypto/hash_df.c | 12 ++++++++++++ src/crypto/hmac_drbg.c | 12 ++++++++++++ src/crypto/rbg.c | 12 ++++++++++++ 4 files changed, 48 insertions(+) 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 );