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 <michael.d.kinney@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
index 00148835f47c18900e70b8973ea711862dd219a9..08bedd57daad7436de577499207d3e215cef12bf 100644 (file)
--- a/CryptoPkg/CryptoPkg.dec
+++ b/CryptoPkg/CryptoPkg.dec
@@ -5,13 +5,7 @@
 #  It also provides a test application to test libraries.\r
 #\r
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  It also provides a test application to test libraries.\r
 #\r
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 321abe4d4c22026a0adae12b64593acbed499020..9dfa349f6dd263664bfcc2a4199e2008b9c34380 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -2,13 +2,7 @@
 #  Cryptographic Library Package for UEFI Security Implementation.\r
 #\r
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  Cryptographic Library Package for UEFI Security Implementation.\r
 #\r
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/CryptoPkg.uni b/CryptoPkg/CryptoPkg.uni
index a764d3dea5202783d0f76f286b828a4afe6199aa..beb0036ef583f814429b048b711304979625f195 100644 (file)
--- a/CryptoPkg/CryptoPkg.uni
+++ b/CryptoPkg/CryptoPkg.uni
@@ -6,13 +6,7 @@
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/CryptoPkgExtra.uni b/CryptoPkg/CryptoPkgExtra.uni
index f37e3cbba2c38abc65939763a4ff3e0679dc2509..1c017b285a62685d62445335c7d7e42d512cf2f3 100644 (file)
--- a/CryptoPkg/CryptoPkgExtra.uni
+++ b/CryptoPkg/CryptoPkgExtra.uni
@@ -3,13 +3,7 @@
 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Include/Library/BaseCryptLib.h b/CryptoPkg/Include/Library/BaseCryptLib.h
index 52ab2316db0ef22e8eefec586a0bb98128265c1d..1350000b79786a14c864c346371df4b6423cb236 100644 (file)
--- a/CryptoPkg/Include/Library/BaseCryptLib.h
+++ b/CryptoPkg/Include/Library/BaseCryptLib.h
@@ -5,13 +5,7 @@
   functionality enabling.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   functionality enabling.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Include/Library/TlsLib.h b/CryptoPkg/Include/Library/TlsLib.h
index e71291eaea453bcb914878d8b77d474f13f3178d..9875cb6e746b5c2f9048b78c929e735404aa06e8 100644 (file)
--- a/CryptoPkg/Include/Library/TlsLib.h
+++ b/CryptoPkg/Include/Library/TlsLib.h
@@ -2,13 +2,7 @@
   Defines TLS Library APIs.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Defines TLS Library APIs.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 5988c103c6f3d601c961df519f77776c14f94b3c..2e403d669ff2df1dbd8dd19d0331702ebf215eda 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -7,13 +7,7 @@
 #  buffer overflow or integer overflow.\r
 #\r
 #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #  buffer overflow or integer overflow.\r
 #\r
 #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.uni b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.uni
index d9231337da446d7107255dcb8f7435f33c75e925..ed1852efbe045e5432dee5b948ac7224e64699e0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.uni
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.uni
@@ -8,13 +8,7 @@
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
index 699dc99ae2661863b14b5e40e90b9c646d1a5d0c..2515b34bb8c4bc7b5d7476fb7aff5fbf83b3a255 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAes.c
@@ -2,13 +2,7 @@
   AES Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   AES Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAesNull.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAesNull.c
index 6e3acf5e78f742a68d270f5dd7859f57c870ceee..a82adacf4fe97ab5a622b0c31c362fa3c19d381e 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAesNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptAesNull.c
@@ -2,13 +2,7 @@
   AES Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   AES Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c
index 3064c443817a047d919877446a8de9fd6be3ca4c..388d312bed8fca97e8eacd0b5bc2304a6b30e29f 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c
@@ -2,13 +2,7 @@
   ARC4 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   ARC4 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c
index 5b48e445f25088c833da86ff2e5746a444e4aad9..1f09bfa30e15b50d3323aa2649a869b9999b33c6 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c
@@ -2,13 +2,7 @@
   ARC4 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   ARC4 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c
index 8025a49cc8bc4795463fdc8f2ddedc66f9a715ac..fd799f33985234b49582eb5554db539256185281 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c
@@ -2,13 +2,7 @@
   TDES Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
   TDES Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c
index cec33b627554f746942b2c0165f8a87d7dcc37d2..efa2716063dc875cf2feb63708cd2767d2ee4b28 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c
@@ -2,13 +2,7 @@
   TDES Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
   TDES Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c
index fb7dd487534c568a8b40b86f6b00fe91677bf2c7..bc02da07b0753dd77610c375438d448dd5b4395b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c
@@ -2,13 +2,7 @@
   MD4 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
   MD4 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c
index c7510d0ec8541b47cb77e251577a3c83524f539b..610c61c713744f485a507818e4302477797fdfc2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c
@@ -2,13 +2,7 @@
   MD4 Digest Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   MD4 Digest Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
index ccf6ad0017783be78c8ae1320c5d29bc38d93b44..0e0d0ec54d2d48827bd22c590d5210aeefbd0474 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptMd5.c
@@ -2,13 +2,7 @@
   MD5 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
   MD5 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
index 42cfd08a28c934df3691d888f3efb3eaef72acc2..bf2f5f4ce40d9fdc20b3e72e7a124b1e19a0eee3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha1.c
@@ -2,13 +2,7 @@
   SHA-1 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
   SHA-1 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
index 06ecb2e98098f00fa7402a84472ededb8751a327..38b9b4d84858d1c06c61f7c4cd5e7ed1963bec54 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha256.c
@@ -2,13 +2,7 @@
   SHA-256 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
   SHA-256 Digest Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
index 3ce372a066d67f08ac558048f1ac0278225540cb..719a5acfe0b90e81db6ec52f0ed78f4a9146c237 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512.c
@@ -2,13 +2,7 @@
   SHA-384 and SHA-512 Digest Wrapper Implementations over OpenSSL.\r
 \r
 Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
   SHA-384 and SHA-512 Digest Wrapper Implementations over OpenSSL.\r
 \r
 Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512Null.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512Null.c
index 8cd754f35851f4e69a005ffb62cb0bef33305c4f..a6c861d7d1d96c55559fb0e0efc3e6dfa721934b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSha512Null.c
@@ -2,13 +2,7 @@
   SHA-384 and SHA-512 Digest Wrapper Implementations which does not provide real capabilities.\r
 \r
 Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
   SHA-384 and SHA-512 Digest Wrapper Implementations which does not provide real capabilities.\r
 \r
 Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c
index ff7b8e5466c79a978eb988191a1a54055485531b..3134806797f84a264d578272905cd8e6ca7a42d2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c
@@ -2,13 +2,7 @@
   HMAC-MD5 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   HMAC-MD5 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c
index 4ddd174168c1e57233b95538ca583d00e838ae69..3aafed874b4b7e97624509359313aa6c3d1c4d22 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c
@@ -2,13 +2,7 @@
   HMAC-MD5 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   HMAC-MD5 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c
index 09c5867d536a0443e2e6a0e5a95d82901e29b1e5..bbe3df4d4f704454c0a04af5d59424e4dffbd0c3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c
@@ -2,13 +2,7 @@
   HMAC-SHA1 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   HMAC-SHA1 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c
index a73dff5584896781a4fe60a13b8a46bfd7b595e2..547aa484ea1647de91a79710402a8d1bb99cc779 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c
@@ -2,13 +2,7 @@
   HMAC-SHA1 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   HMAC-SHA1 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
index d6b3ae4883297f09d2e220487f1a736dd7493a51..ac9084fa850db0dfa9583231453bff7f16aa5a46 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256.c
@@ -2,13 +2,7 @@
   HMAC-SHA256 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
   HMAC-SHA256 Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256Null.c b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256Null.c
index 1696fa1eb919cc553cdacfd98fd25a96b980a802..f0a4420e276d5ed35d27acd1e9ffe605a4db3532 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha256Null.c
@@ -2,13 +2,7 @@
   HMAC-SHA256 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
   HMAC-SHA256 Wrapper Implementation which does not provide real capabilities.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
index 026793f66453776ec75593bc239c10fb963486ee..ff6d33835b2a3fa2e0c0ebab511df6f0b9dbd3a7 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
+++ b/CryptoPkg/Library/BaseCryptLib/InternalCryptLib.h
@@ -2,13 +2,7 @@
   Internal include file for BaseCryptLib.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Internal include file for BaseCryptLib.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index e84d7f91e46a9e3f55f547ea71ee65bdc5bbd407..e701c3d2f84cee36e15f7fb2050d9e2418ba90b0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -14,13 +14,7 @@
 #  supported in this instance.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  supported in this instance.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.uni b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.uni
index 64206e76d8c0b75cb39c256365965a8e112e964f..9937555beb913e96bfa4ab5218eae80603c3d734 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.uni
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.uni
@@ -14,13 +14,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
index de758ac8547fb3d8fd67db594b545f7f985874a1..75a133bd0ca057afaa848fa9543aad310c6d8c0a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
@@ -2,13 +2,7 @@
   PEM (Privacy Enhanced Mail) Format Handler Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   PEM (Privacy Enhanced Mail) Format Handler Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPemNull.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPemNull.c
index 8c9e4f0bb59a1ae1f207476631f4a099aa1874c4..4eeabd91ad6ed297b2beaddfd70148814418c067 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPemNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPemNull.c
@@ -3,13 +3,7 @@
   not provide real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
   not provide real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
index 74e50a2e862bae55a13f9cb333cf511ecb09e3f1..2772b1e2be3c6f16842eceb388016fdb7ba90816 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
@@ -10,13 +10,7 @@
   data structure.\r
 \r
 Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
   data structure.\r
 \r
 Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticodeNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticodeNull.c
index afec025dfa7c815ec680ffaf70e5a38e80579d05..62e8400c4ccc82a6a636a1d4a49d1a15f8eeb311 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticodeNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticodeNull.c
@@ -3,13 +3,7 @@
   real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
   real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
index abd581d93f25c8fe907439cad7361ce28c0741d0..abe4601d111f3e8d54de153ef7d5443d74e824cb 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
@@ -2,13 +2,7 @@
   Diffie-Hellman Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Diffie-Hellman Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDhNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDhNull.c
index 4def5171627a17b44c114e675ee2f9e717e68592..89870841224044c60447bd65c868e59f5d88e9e3 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDhNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDhNull.c
@@ -3,13 +3,7 @@
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
index 78c3a34f52beb108e6b8547384bb3263ca107513..a89c1525c111912878104de982a240e35b9c0f74 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2.c
@@ -2,13 +2,7 @@
   PBKDF2 Key Derivation Function Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
   PBKDF2 Key Derivation Function Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2Null.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2Null.c
index 54d2637d6cba609d70274a125aab137c1b41d88a..b8a41fbb20ce3c887c357930b41653297b502060 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs5Pbkdf2Null.c
@@ -3,13 +3,7 @@
   capabilities.\r
 \r
 Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
   capabilities.\r
 \r
 Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
index bc804015624d91468e02b12d03b60f202ac23113..442f573f8bddb108bd0859f69c8fef59f903006b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Sign.c
@@ -2,13 +2,7 @@
   PKCS#7 SignedData Sign Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   PKCS#7 SignedData Sign Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
index 1ce7202d911de2eb2caf9fbcfa4daeb54d99278e..d7ff8ba947c45353b93725c694c234e145e30d2c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7SignNull.c
@@ -3,13 +3,7 @@
   capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
   capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
index a5442bd4b456645ca0882a3c82102bb93452767c..313f459b11f615e9374d0fcb3d1b41af2e8818f9 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c
@@ -2,13 +2,7 @@
   Non-runtime specific implementation of PKCS#7 SignedData Verification Wrapper.\r
 \r
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
   Non-runtime specific implementation of PKCS#7 SignedData Verification Wrapper.\r
 \r
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
index 66ebbb693c61f50da92e010ade1be732e4a17cfa..d99597d1810ed7558b309c14487c88cba2f59da0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c
@@ -11,13 +11,7 @@
   Variable and will do basic check for data structure.\r
 \r
 Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
   Variable and will do basic check for data structure.\r
 \r
 Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
index f2a1a620ada41b175e9b24a36ccea231f6dc4b47..0ddf16a61b31587795051ef6a0a6620179a0baf2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyNull.c
@@ -3,13 +3,7 @@
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
index bbbd4f5892111d15b38dfa7c7e7183a269d8e6b7..1b0cda18219cef8fe04ef4783d77f87a42985ae8 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyRuntime.c
@@ -2,13 +2,7 @@
   Runtime specific implementation of PKCS#7 SignedData Verification Wrapper.\r
 \r
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
   Runtime specific implementation of PKCS#7 SignedData Verification Wrapper.\r
 \r
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
index a86e0629b8b29f75b06cf1f2318a3c31837f32b2..454dbbd476d9a5465929f1413bf7f6ed04e32009 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
@@ -8,13 +8,7 @@
   4) RsaPkcs1Verify\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   4) RsaPkcs1Verify\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
index 51f045669620fb5938fc6c49621f58f74ac68cd4..e3dd4844c4449c430aaf7c56818831a3dd0fb88c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
@@ -8,13 +8,7 @@
   4) RsaPkcs1Sign\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   4) RsaPkcs1Sign\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
index b72079a8d5c62b5a5c0b233ae812c3b7550d485d..260cb00e658fedd3aa0d3621db3543f4fb286f3b 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExtNull.c
@@ -8,13 +8,7 @@
   4) RsaPkcs1Sign\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   4) RsaPkcs1Sign\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
index 540c5715cb8ad996f5d3924174bb308613ca79be..ff7f6488f23e88867bc4691b0dbf4b0c680f92f5 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
@@ -6,13 +6,7 @@
   revoked.\r
 \r
 Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
   revoked.\r
 \r
 Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTsNull.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTsNull.c
index a43f733c86e1f5ef7ead4f0de677ad42ee4df805..907988814a3aab90ba98475e7c4aeecf48d37051 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTsNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTsNull.c
@@ -3,13 +3,7 @@
   not provide real capabilities.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
   not provide real capabilities.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index 75337ed32bbc21ed0034078e79e0ba96980c6b41..fda86488e69b980c58513e23c0bf12cacf477750 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -2,13 +2,7 @@
   X.509 Certificate Handler Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   X.509 Certificate Handler Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
index 31cae46154617592698ad629e4872c6bae6a30dd..559236820a38b41619c7822f9e7e919fcad5ffb4 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
@@ -3,13 +3,7 @@
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   real capabilities.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
index fd3c6d4adbe61d81b3cc558561be5ad0bc3b5821..9c37a3a296ba5178dafd9bbfdf71ebb224ae9b7d 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
@@ -2,13 +2,7 @@
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
index 26c943e4aa8e831c605277ebcf8742607da3886c..8699cfeb7165600f1e1d2c38ce085a823d848cfb 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
@@ -2,13 +2,7 @@
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
index c292a2301e44a554bbe722f41761e2dab6e1bdb2..d2914f8758a3417399863876f2d5345c15a6a13f 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandNull.c
@@ -3,13 +3,7 @@
   real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
   real capabilities.\r
 \r
 Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
index 74d9cbca2f89d4a42408f3903533b89decab82a1..b0bfd5fb4f96253cdb28a441429d1f15d00ba395 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandTsc.c
@@ -2,13 +2,7 @@
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
 Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 95d4278090221433326c3fc7dbaf4d498f0ba11d..57a642f9d89dfd9ee7ddbd84ad41c74882ea2974 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -12,13 +12,7 @@
 #  authenticode signature verification functions are not supported in this instance.\r
 #\r
 #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #  authenticode signature verification functions are not supported in this instance.\r
 #\r
 #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.uni b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.uni
index 5fbe078d96482a24ecf54f29284e8483843526e6..c0a16f1b841f7a76fd1837b9960a27fca7424935 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.uni
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.uni
@@ -13,13 +13,7 @@
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index c3aa9c9eab1673e05663f996c1332729fbd1a7e2..21a2ef8433f736cdcf119a1bf9c58d10b10c00da 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -12,13 +12,7 @@
 #  authenticode signature verification functions are not supported in this instance.\r
 #\r
 #  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
 #  authenticode signature verification functions are not supported in this instance.\r
 #\r
 #  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.uni b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.uni
index d945034ef5e6e116e09584b7226dd450991b1ce9..83485fbb905615312596313ad7fb02061467807c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.uni
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.uni
@@ -13,13 +13,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
index 19c071e2bf655fc58d7d501ff27754e1778108b1..d14644d13597f8f06f3fdc01e4576433880a811a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/BaseMemAllocation.c
@@ -3,13 +3,7 @@
   during PEI & DXE phases.\r
 \r
 Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
   during PEI & DXE phases.\r
 \r
 Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
index 0cd90434ca61c6aacfa76561fe54a0be0bba761a..18b04f2afd54e5daa099cb5fc2970b0798f01c40 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/ConstantTimeClock.c
@@ -13,13 +13,7 @@
   6)  DhGenerateKey\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   6)  DhGenerateKey\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
index 80f5c2578e21adbd482ac329cc5144cc475c19cc..71a2ef34ed2bd99dc986c082199546e6a6516906 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
@@ -3,13 +3,7 @@
   Cryptographic Library.\r
 \r
 Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Cryptographic Library.\r
 \r
 Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
index 92bb9ddccdb9e64998aa0eee7e21d6938cbfaa8e..3e12a0500afea8a9ceeee3e914a0b9ae858419b2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c
@@ -3,13 +3,7 @@
   Library at Runtime Phase.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Library at Runtime Phase.\r
 \r
 Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
index 5f9b0c20d75d63f030e8fea540ac8800c1ad582c..027e5a942ee1555496eaa7325598f9f0ced5aa29 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c
@@ -3,13 +3,7 @@
   for OpenSSL-based Cryptographic Library (used in DXE & RUNTIME).\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   for OpenSSL-based Cryptographic Library (used in DXE & RUNTIME).\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index feaf58b0c79a84bd499329aec1e3f99f148e0816..a241fb96fb7370a44fb6aa2f775bb182fa32ddc4 100644 (file)
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -3,13 +3,7 @@
   cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/assert.h b/CryptoPkg/Library/Include/assert.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/assert.h
+++ b/CryptoPkg/Library/Include/assert.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/ctype.h b/CryptoPkg/Library/Include/ctype.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/ctype.h
+++ b/CryptoPkg/Library/Include/ctype.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/errno.h b/CryptoPkg/Library/Include/errno.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/errno.h
+++ b/CryptoPkg/Library/Include/errno.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/limits.h b/CryptoPkg/Library/Include/limits.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/limits.h
+++ b/CryptoPkg/Library/Include/limits.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/memory.h b/CryptoPkg/Library/Include/memory.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/memory.h
+++ b/CryptoPkg/Library/Include/memory.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/stdarg.h b/CryptoPkg/Library/Include/stdarg.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/stdarg.h
+++ b/CryptoPkg/Library/Include/stdarg.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/stddef.h b/CryptoPkg/Library/Include/stddef.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/stddef.h
+++ b/CryptoPkg/Library/Include/stddef.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/stdio.h b/CryptoPkg/Library/Include/stdio.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/stdio.h
+++ b/CryptoPkg/Library/Include/stdio.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/stdlib.h b/CryptoPkg/Library/Include/stdlib.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/stdlib.h
+++ b/CryptoPkg/Library/Include/stdlib.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/string.h b/CryptoPkg/Library/Include/string.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/string.h
+++ b/CryptoPkg/Library/Include/string.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/strings.h b/CryptoPkg/Library/Include/strings.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/strings.h
+++ b/CryptoPkg/Library/Include/strings.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/sys/time.h b/CryptoPkg/Library/Include/sys/time.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/sys/time.h
+++ b/CryptoPkg/Library/Include/sys/time.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/sys/types.h b/CryptoPkg/Library/Include/sys/types.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/sys/types.h
+++ b/CryptoPkg/Library/Include/sys/types.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/syslog.h b/CryptoPkg/Library/Include/syslog.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/syslog.h
+++ b/CryptoPkg/Library/Include/syslog.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/time.h b/CryptoPkg/Library/Include/time.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/time.h
+++ b/CryptoPkg/Library/Include/time.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/Include/unistd.h b/CryptoPkg/Library/Include/unistd.h
index 1a8d1c47dee6bf9f635a444f5e19cfb2560d7123..040ecfa5193df71518432349a7cf4b54687028b4 100644 (file)
--- a/CryptoPkg/Library/Include/unistd.h
+++ b/CryptoPkg/Library/Include/unistd.h
@@ -2,13 +2,7 @@
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Include file to support building the third-party cryptographic library.\r
 \r
 Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni b/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni
index 6732df9cefa8d2acf9a9e8e419edf3afdcca3773..47f19d4080f7d919d4d1c80da47beaabe2a148bb 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni
+++ b/CryptoPkg/Library/IntrinsicLib/BaseIntrinsicLib.uni
@@ -5,13 +5,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/CopyMem.c b/CryptoPkg/Library/IntrinsicLib/CopyMem.c
index 6cc52b22e1f0c4b1d083d19011268d122524bd42..e29b4918d2005f1c2ba4322b453d6c121df4b5c4 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/CopyMem.c
+++ b/CryptoPkg/Library/IntrinsicLib/CopyMem.c
@@ -3,13 +3,7 @@
   Cryptographic Library.\r
 \r
 Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
   Cryptographic Library.\r
 \r
 Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
index 0c0835d4008ca8a5496b7d0997d664f3ac03ad4b..fa35d9b72d6718e45b11d18ce9e8611537bbfaed 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
@@ -4,13 +4,7 @@
   to handle 64-bit math. These functions use non-standard calling conventions.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
   to handle 64-bit math. These functions use non-standard calling conventions.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm
index a30edbf7d2a1655260b7afcc9bb74247d2ba2260..056b5b1fb17d1887e1233463239c2ce8a0774ba6 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.nasm
@@ -1,13 +1,7 @@
 ;------------------------------------------------------------------------------\r
 ;\r
 ; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 ;------------------------------------------------------------------------------\r
 ;\r
 ; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r

-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions of the BSD License\r
-; which accompanies this distribution.  The full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php.\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+; SPDX-License-Identifier: BSD-2-Clause-Patent\r

 ;\r
 ; Module Name:\r
 ;\r
 ;\r
 ; Module Name:\r
 ;\r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
index 86b10040dd157d5e02105c83ba7b039b23580074..efa38983a51936772d6276e0dfd5e20d03de925b 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
@@ -4,13 +4,7 @@
   to handle 64-bit math. These functions use non-standard calling conventions.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
   to handle 64-bit math. These functions use non-standard calling conventions.\r
 \r
 Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm
index 9bf1711c9b6cb2664dff0492e7920e9f1ea252ac..1d51a4dfa30bcda668b7cf13601482f2b0d4d706 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm
+++ b/CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.nasm
@@ -1,13 +1,7 @@
 ;------------------------------------------------------------------------------\r
 ;\r
 ; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 ;------------------------------------------------------------------------------\r
 ;\r
 ; Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r

-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions of the BSD License\r
-; which accompanies this distribution.  The full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php.\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+; SPDX-License-Identifier: BSD-2-Clause-Patent\r

 ;\r
 ; Module Name:\r
 ;\r
 ;\r
 ; Module Name:\r
 ;\r

diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
index 9704b9ea7d8e359f83e5d601716c92d1c61bc28c..5a20967b6cb80604b3c067b7272fc5ce71e172e7 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -2,13 +2,7 @@
 #  Intrinsic Routines Wrapper Library Instance.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  Intrinsic Routines Wrapper Library Instance.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
index 324381b6e9c255cefd3407df04efbfd8fac44923..6e4d4a68cc3ff910b7f4d676262cdc66f4204940 100644 (file)
--- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
+++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
@@ -3,13 +3,7 @@
   Cryptographic Library.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   Cryptographic Library.\r
 \r
 Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 6162d291434aa731dc4c33a9892bdce9b3f00216..530ac5f1109625825642a1459f4800d62f479262 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -2,13 +2,7 @@
 #  This module provides OpenSSL Library implementation.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.uni b/CryptoPkg/Library/OpensslLib/OpensslLib.uni
index 6aba8479f838cc0b0bbc053b1d3660bc0f3e4096..abaff8a3c37f016ad90aec762233c821daee0782 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.uni
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.uni
@@ -5,13 +5,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index b04bf62b4e9993a7c968055a6fa81cf37137d36a..231010098851851dc702144bb3146809d5bbfe59 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -2,13 +2,7 @@
 #  This module provides OpenSSL Library implementation.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
 #  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.uni b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.uni
index 10a5b7f3ae74def53453f23f482905c7981e75c5..d3f12e178caebd79a59f233123201fc72bf2077a 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.uni
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.uni
@@ -5,13 +5,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/InternalTlsLib.h b/CryptoPkg/Library/TlsLib/InternalTlsLib.h
index b6cf9816aa38ab7777333bde3ebc1934cf5d54b1..ce7f4ced4a3078d603116f37bf055ce737eedd27 100644 (file)
--- a/CryptoPkg/Library/TlsLib/InternalTlsLib.h
+++ b/CryptoPkg/Library/TlsLib/InternalTlsLib.h
@@ -2,13 +2,7 @@
   Internal include file for TlsLib.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
   Internal include file for TlsLib.\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c
index 9154686610e00c859619f49103e1cf61b216d191..74b577d60ee390b52a36578a7db31aea72ca9a2f 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsConfig.c
+++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
@@ -3,13 +3,7 @@
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/TlsInit.c b/CryptoPkg/Library/TlsLib/TlsInit.c
index a530ff7ad5d5be08da6a6c7563932b9ca5463c8d..f9ad6f6b946cee6b44fc520fa6fe9f9311db1af0 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsInit.c
+++ b/CryptoPkg/Library/TlsLib/TlsInit.c
@@ -3,13 +3,7 @@
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf b/CryptoPkg/Library/TlsLib/TlsLib.inf
index 7bf56f26a13da6e56dc30a482966625f5a1aae69..2f3ce695c33ea7a3ff53feb2970696e3a98d59e9 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsLib.inf
+++ b/CryptoPkg/Library/TlsLib/TlsLib.inf
@@ -3,13 +3,7 @@
 #\r
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r

 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/TlsLib.uni b/CryptoPkg/Library/TlsLib/TlsLib.uni
index e43a5df8e6451c0a3318d2edb6a15384e23bf841..fe854217bad45f747702cc291892794b466512b1 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsLib.uni
+++ b/CryptoPkg/Library/TlsLib/TlsLib.uni
@@ -3,13 +3,7 @@
 //\r
 // Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 //\r
 //\r
 // Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 //\r

-// This program and the accompanying materials\r
-// are licensed and made available under the terms and conditions of the BSD License\r
-// which accompanies this distribution.  The full text of the license may be found at\r
-// http://opensource.org/licenses/bsd-license.php\r
-//\r
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+// SPDX-License-Identifier: BSD-2-Clause-Patent\r

 //\r
 // **/\r
 \r
 //\r
 // **/\r
 \r

diff --git a/CryptoPkg/Library/TlsLib/TlsProcess.c b/CryptoPkg/Library/TlsLib/TlsProcess.c
index 38baac0e8b3f483cce8d1b01edd86e291585bd5f..ac952e903db84019d2984b06dcc1ef9bb7fae366 100644 (file)
--- a/CryptoPkg/Library/TlsLib/TlsProcess.c
+++ b/CryptoPkg/Library/TlsLib/TlsProcess.c
@@ -4,13 +4,7 @@
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
 Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r

-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r