Skip to content

Commit 4768af6

Browse files
mdkinneymdkinney
committed
CryptoPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373 Replace BSD 2-Clause License with BSD+Patent License. This change is based on the following emails: https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html RFCs with detailed process for the license change: V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <[email protected]>
1 parent 9aecbee commit 4768af6

File tree

99 files changed

+99
-693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+99
-693
lines changed

‎CryptoPkg/CryptoPkg.dec

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
# It also provides a test application to test libraries.
66
#
77
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
8-
# This program and the accompanying materials
9-
# are licensed and made available under the terms and conditions of the BSD License
10-
# which accompanies this distribution. The full text of the license may be found at
11-
# http://opensource.org/licenses/bsd-license.php
12-
#
13-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
# SPDX-License-Identifier: BSD-2-Clause-Patent
159
#
1610
##
1711

‎CryptoPkg/CryptoPkg.dsc

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
# Cryptographic Library Package for UEFI Security Implementation.
33
#
44
# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
5-
# This program and the accompanying materials
6-
# are licensed and made available under the terms and conditions of the BSD License
7-
# which accompanies this distribution. The full text of the license may be found at
8-
# http://opensource.org/licenses/bsd-license.php
9-
#
10-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
# SPDX-License-Identifier: BSD-2-Clause-Patent
126
#
137
##
148

‎CryptoPkg/CryptoPkg.uni

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
//
77
// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
88
//
9-
// This program and the accompanying materials
10-
// are licensed and made available under the terms and conditions of the BSD License
11-
// which accompanies this distribution. The full text of the license may be found at
12-
// http://opensource.org/licenses/bsd-license.php
13-
//
14-
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
15-
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
9+
// SPDX-License-Identifier: BSD-2-Clause-Patent
1610
//
1711
// **/
1812

‎CryptoPkg/CryptoPkgExtra.uni

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
//
44
// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
55
//
6-
// This program and the accompanying materials
7-
// are licensed and made available under the terms and conditions of the BSD License
8-
// which accompanies this distribution. The full text of the license may be found at
9-
// http://opensource.org/licenses/bsd-license.php
10-
//
11-
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
12-
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
6+
// SPDX-License-Identifier: BSD-2-Clause-Patent
137
//
148
// **/
159

‎CryptoPkg/Include/Library/BaseCryptLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
functionality enabling.
66
77
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
8-
This program and the accompanying materials
9-
are licensed and made available under the terms and conditions of the BSD License
10-
which accompanies this distribution. The full text of the license may be found at
11-
http://opensource.org/licenses/bsd-license.php
12-
13-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
8+
SPDX-License-Identifier: BSD-2-Clause-Patent
159
1610
**/
1711

‎CryptoPkg/Include/Library/TlsLib.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
Defines TLS Library APIs.
33
44
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
# buffer overflow or integer overflow.
88
#
99
# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
10-
# This program and the accompanying materials
11-
# are licensed and made available under the terms and conditions of the BSD License
12-
# which accompanies this distribution. The full text of the license may be found at
13-
# http://opensource.org/licenses/bsd-license.php
14-
#
15-
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
16-
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
10+
# SPDX-License-Identifier: BSD-2-Clause-Patent
1711
#
1812
##
1913

‎CryptoPkg/Library/BaseCryptLib/BaseCryptLib.uni

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88
//
99
// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
1010
//
11-
// This program and the accompanying materials
12-
// are licensed and made available under the terms and conditions of the BSD License
13-
// which accompanies this distribution. The full text of the license may be found at
14-
// http://opensource.org/licenses/bsd-license.php
15-
//
16-
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
17-
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
11+
// SPDX-License-Identifier: BSD-2-Clause-Patent
1812
//
1913
// **/
2014

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
AES Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptAesNull.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
AES Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
ARC4 Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
ARC4 Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
TDES Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
TDES Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
MD4 Digest Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
MD4 Digest Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
MD5 Digest Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
SHA-1 Digest Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
SHA-256 Digest Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
SHA-384 and SHA-512 Digest Wrapper Implementations over OpenSSL.
33
44
Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512Null.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
SHA-384 and SHA-512 Digest Wrapper Implementations which does not provide real capabilities.
33
44
Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
HMAC-MD5 Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
HMAC-MD5 Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
HMAC-SHA1 Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
HMAC-SHA1 Wrapper Implementation which does not provide real capabilities.
33
44
Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

‎CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
HMAC-SHA256 Wrapper Implementation over OpenSSL.
33
44
Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
5-
This program and the accompanying materials
6-
are licensed and made available under the terms and conditions of the BSD License
7-
which accompanies this distribution. The full text of the license may be found at
8-
http://opensource.org/licenses/bsd-license.php
9-
10-
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
5+
SPDX-License-Identifier: BSD-2-Clause-Patent
126
137
**/
148

0 commit comments

Comments
 (0)