Skip to content

Commit 7eee85b

Browse files
committed
Change rdrand license entry to 3-clause BSD
The headers for all rdrand sources reference 3-clause BSD, and the Intel Sample Source Code License is almost assuredly too restrictive. For one, the license restricts the platform to Windows, which this project does not support. Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
1 parent da495bd commit 7eee85b

File tree

1 file changed

+25
-125
lines changed

1 file changed

+25
-125
lines changed

License.txt

Lines changed: 25 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -777,132 +777,32 @@ SUCH DAMAGE.
777777

778778
10. rdrand
779779

780-
Intel Sample Source Code license.
781-
782-
This license governs use of the accompanying software. By installing or
783-
copying all or any part of the software components in this package, you
784-
("you" or "Licensee") agree to the terms of this agreement. Do
785-
not install or copy the software until you have carefully read and
786-
agreed to the following terms and conditions. If you do not agree to the
787-
terms of this agreement, promptly return the software to Intel
788-
Corporation ("Intel").
789-
790-
1. Definitions:
791-
792-
A. "Materials" are defined as the software (including the
793-
Redistributables and Sample Source as defined herein), documentation,
794-
and other materials, including any updates and upgrade thereto, that are
795-
provided to you under this Agreement.
796-
797-
B. "Redistributables" are the files listed in the "redist.txt" file that
798-
is included in the Materials or are otherwise clearly identified as
799-
redistributable files by Intel.
800-
801-
C. "Sample Source" is the source code file(s) that: (i)
802-
demonstrate(s) certain functions for particular purposes; (ii) are
803-
identified as sample source code; and (iii) are provided hereunder in
804-
source code form.
805-
806-
D. "Intel's Licensed Patent Claims" means those claims of
807-
Intel's patents that (a) are infringed by the Sample Source or
808-
Redistributables, alone and not in combination, in their unmodified
809-
form, as furnished by Intel to Licensee and (b) Intel has the right to
810-
license.
780+
BSD License
781+
782+
Copyright (C) 2011-2019 Intel Corporation. All rights reserved.
811783

812-
2. License Grant: Subject to all of the terms and conditions of this
813-
Agreement:
814-
815-
A. Intel grants to you a non-exclusive, non-assignable, copyright
816-
license to use the Material for your internal development purposes only.
817-
818-
B. Intel grants to you a non-exclusive, non-assignable copyright license
819-
to reproduce the Sample Source, prepare derivative works of the Sample
820-
Source and distribute the Sample Source or any derivative works thereof
821-
that you create, as part of the product or application you develop using
822-
the Materials.
823-
824-
C. Intel grants to you a non-exclusive, non-assignable copyright license
825-
to distribute the Redistributables, or any portions thereof, as part of
826-
the product or application you develop using the Materials.
827-
828-
D. Intel grants Licensee a non-transferable, non-exclusive, worldwide,
829-
non-sublicenseable license under Intel's Licensed Patent Claims to
830-
make, use, sell, and import the Sample Source and the Redistributables.
831-
832-
3. Conditions and Limitations:
833-
834-
A. This license does not grant you any rights to use Intel's name,
835-
logo or trademarks.
836-
837-
B. Title to the Materials and all copies thereof remain with Intel. The
838-
Materials are copyrighted and are protected by United States copyright
839-
laws. You will not remove any copyright notice from the Materials. You
840-
agree to prevent any unauthorized copying of the Materials. Except as
841-
expressly provided herein, Intel does not grant any express or implied
842-
right to you under Intel patents, copyrights, trademarks, or trade
843-
secret information.
844-
845-
C. You may NOT: (i) use or copy the Materials except as provided in this
846-
Agreement; (ii) rent or lease the Materials to any third party; (iii)
847-
assign this Agreement or transfer the Materials without the express
848-
written consent of Intel; (iv) modify, adapt, or translate the Materials
849-
in whole or in part except as provided in this Agreement; (v) reverse
850-
engineer, decompile, or disassemble the Materials not provided to you in
851-
source code form; or (vii) distribute, sublicense or transfer the source
852-
code form of any components of the Materials and derivatives thereof to
853-
any third party except as provided in this Agreement.
854-
855-
D. Platform Limitation - The licenses granted in section 2 extend only
856-
to the software or derivative works that you create that run directly on
857-
a Microsoft Windows operating system product, Microsoft run-time
858-
technology (such as the .NET Framework or Silverlight), or Microsoft
859-
application platform (such as Microsoft Office or Microsoft Dynamics).
860-
861-
4. No Warranty:
862-
863-
THE MATERIALS ARE PROVIDED "AS IS". INTEL DISCLAIMS ALL EXPRESS OR
864-
IMPLIED WARRANTIES WITH RESPECT TO THEM, INCLUDING ANY IMPLIED
865-
WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT, AND FITNESS FOR ANY
866-
PARTICULAR PURPOSE.
867-
868-
5. LIMITATION OF LIABILITY: NEITHER INTEL NOR ITS SUPPLIERS SHALL BE
869-
LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION,
870-
DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF
871-
BUSINESS INFORMATION, OR OTHER LOSS) ARISING OUT OF THE USE OF OR
872-
INABILITY TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE
873-
POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME JURISDICTIONS PROHIBIT THE
874-
EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL
875-
DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU.
876-
877-
6. USER SUBMISSIONS: You agree that any material, information or other
878-
communication, including all data, images, sounds, text, and other
879-
things embodied therein, you transmit or post to an Intel website or
880-
provide to Intel under this Agreement will be considered
881-
non-confidential ("Communications"). Intel will have no confidentiality
882-
obligations with respect to the Communications. You agree that Intel and
883-
its designees will be free to copy, modify, create derivative works,
884-
publicly display, disclose, distribute, license and sublicense through
885-
multiple tiers of distribution and licensees, incorporate and otherwise
886-
use the Communications, including derivative works thereto, for any and
887-
all commercial or non-commercial purposes
888-
889-
7. TERMINATION OF THIS LICENSE: This Agreement becomes effective on the
890-
date you accept this Agreement and will continue until terminated as
891-
provided for in this Agreement. Intel may terminate this license at any
892-
time if you are in breach of any of its terms and conditions. Upon
893-
termination, you will immediately return to Intel or destroy the
894-
Materials and all copies thereof.
895-
896-
8. U.S. GOVERNMENT RESTRICTED RIGHTS: The Materials are provided with
897-
"RESTRICTED RIGHTS". Use, duplication or disclosure by the Government is
898-
subject to restrictions set forth in FAR52.227-14 and DFAR252.227-7013
899-
et seq. or its successor. Use of the Materials by the Government
900-
constitutes acknowledgment of Intel's rights in them.
901-
902-
9. APPLICABLE LAWS: Any claim arising under or relating to this
903-
Agreement shall be governed by the internal substantive laws of the
904-
State of Delaware, without regard to principles of conflict of laws. You
905-
may not export the Materials in violation of applicable export laws.
784+
Redistribution and use in source and binary forms, with or without
785+
modification, are permitted provided that the following conditions are met:
786+
787+
- Redistributions of source code must retain the above copyright notice,
788+
this list of conditions and the following disclaimer.
789+
- Redistributions in binary form must reproduce the above copyright
790+
notice, this list of conditions and the following disclaimer in the
791+
documentation and/or other materials provided with the distribution.
792+
- Neither the name of Intel Corporation nor the names of its contributors
793+
may be used to endorse or promote products derived from this software
794+
without specific prior written permission.
795+
796+
THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION "AS IS" AND ANY EXPRESS OR
797+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
798+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
799+
EVENT SHALL INTEL CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
800+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
801+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
802+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
803+
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
804+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
805+
POSSIBILITY OF SUCH DAMAGE.
906806

907807

908808

0 commit comments

Comments
 (0)