From dda856b3c16240b7c8731ae58af1faf11d979717 Mon Sep 17 00:00:00 2001 From: "Dong, Guo" Date: Thu, 28 Aug 2014 05:50:45 +0000 Subject: [PATCH] CryptoPkg: INF/DEC file updates to EDK II packages 1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dong, Guo Reviewed-by: Gao, Liming git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15954 6f19259b-4bc3-4df7-8a09-765794883524 --- CryptoPkg/Application/Cryptest/Cryptest.inf | 13 +++++++++---- CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf | 9 +++++++-- CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 7 ++++--- CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 9 +++++---- CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 11 ++++++----- CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 9 +++++---- .../BaseCryptLibRuntimeCryptProtocol.inf | 5 +++-- CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf | 3 ++- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 ++- 9 files changed, 43 insertions(+), 26 deletions(-) diff --git a/CryptoPkg/Application/Cryptest/Cryptest.inf b/CryptoPkg/Application/Cryptest/Cryptest.inf index ce9f62567b..265b731a90 100644 --- a/CryptoPkg/Application/Cryptest/Cryptest.inf +++ b/CryptoPkg/Application/Cryptest/Cryptest.inf @@ -1,9 +1,9 @@ ## @file -# UEFI Application for the Validation of cryptography library -# (based on OpenSSL 0.9.8l). -# This is a shell application that will test the crypto library. +# Shell application that will test the crypto library. # -# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+# UEFI Application for the Validation of cryptography library (based on OpenSSL 0.9.8zb). +# +# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -17,6 +17,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Cryptest + MODULE_UNI_FILE = Cryptest.uni FILE_GUID = fb925ac7-192a-9567-8586-7c6f5f710607 MODULE_TYPE = UEFI_APPLICATION VERSION_STRING = 1.0 @@ -53,3 +54,7 @@ DebugLib MemoryAllocationLib BaseCryptLib + +[UserExtensions.TianoCore."ExtraFiles"] + CryptestExtra.uni + \ No newline at end of file diff --git a/CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf b/CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf index 7625c40050..23df499ad3 100644 --- a/CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf +++ b/CryptoPkg/CryptRuntimeDxe/CryptRuntimeDxe.inf @@ -1,7 +1,7 @@ ## @file -# Component description file for Cryptographic Runtime Driver. +# This driver installs runtime Crypt protocol to provide SHA256 and RSA service. # -# Copyright (c) 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = CryptRuntimeDxe + MODULE_UNI_FILE = CryptRuntimeDxe.uni FILE_GUID = 858031F3-96A2-406E-ABCC-ED264A3A31D6 MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 @@ -47,3 +48,7 @@ [Depex] TRUE + +[UserExtensions.TianoCore."ExtraFiles"] + CryptRuntimeDxeExtra.uni + \ No newline at end of file diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf index bea2e2b8c6..a6e6dcafab 100644 --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -3,10 +3,10 @@ # # Caution: This module requires additional review when modified. # This library will have external input - signature. -# This external input must be validated carefully to avoid security issue like -# buffer overflow, integer overflow. +# This external input must be validated carefully to avoid security issues such as +# buffer overflow or integer overflow. # -# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -20,6 +20,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseCryptLib + MODULE_UNI_FILE = BaseCryptLib.uni FILE_GUID = be3bb803-91b6-4da0-bd91-a8b21c18ca5d MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf index 97965b4e9c..74ca6a9cd9 100644 --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf @@ -3,16 +3,16 @@ # # Caution: This module requires additional review when modified. # This library will have external input - signature. -# This external input must be validated carefully to avoid security issue like -# buffer overflow, integer overflow. +# This external input must be validated carefully to avoid security issues such as +# buffer overflow or integer overflow. # # Note: MD4 Digest functions, HMAC-MD5 functions, HMAC-SHA1 functions, AES/ # TDES/ARC4 functions, RSA external functions, PKCS#7 SignedData sign functions, # Diffie-Hellman functions, X.509 certificate handler functions, authenticode -# signature verification functions, PEM handler functions, pseudorandom number +# signature verification functions, PEM handler functions, and pseudorandom number # generator functions are not supported in this instance. # -# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -26,6 +26,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PeiCryptLib + MODULE_UNI_FILE = PeiCryptLib.uni FILE_GUID = 9a2a4375-194c-4e97-9f67-547ec98d96ca MODULE_TYPE = PEIM VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf index 3cf0965738..355ecc4969 100644 --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf @@ -1,17 +1,17 @@ ## @file -# Cryptographic Library Instance for DXE_RUNTIME_DRIVER +# Cryptographic Library Instance for DXE_RUNTIME_DRIVER. # # Caution: This module requires additional review when modified. # This library will have external input - signature. -# This external input must be validated carefully to avoid security issue like -# buffer overflow, integer overflow. +# This external input must be validated carefully to avoid security issues such as +# buffer overflow or integer overflow. # # Note: MD4 Digest functions, HMAC-MD5 functions, HMAC-SHA1 functions, AES/ # TDES/ARC4 functions, RSA external functions, PKCS#7 SignedData sign functions, -# Diffie-Hellman functions, authenticode signature verification functions are +# Diffie-Hellman functions, and authenticode signature verification functions are # not supported in this instance. # -# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -25,6 +25,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = RuntimeCryptLib + MODULE_UNI_FILE = RuntimeCryptLib.uni FILE_GUID = 78189cc0-727d-46a4-84ea-f7dd860de64a MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf index 7669ff3e80..c62da1a3d4 100644 --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf @@ -3,15 +3,15 @@ # # Caution: This module requires additional review when modified. # This library will have external input - signature. -# This external input must be validated carefully to avoid security issue like -# buffer overflow, integer overflow. +# This external input must be validated carefully to avoid security issues such as +# buffer overflow or integer overflow. # # Note: MD4 Digest functions, HMAC-MD5 functions, HMAC-SHA1 functions, AES/ # TDES/ARC4 functions, RSA external functions, PKCS#7 SignedData sign functions, -# Diffie-Hellman functions, authenticode signature verification functions are +# Diffie-Hellman functions, and authenticode signature verification functions are # not supported in this instance. # -# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -25,6 +25,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = SmmCryptLib + MODULE_UNI_FILE = SmmCryptLib.uni FILE_GUID = 028080a3-8958-4a62-a1a8-0fa1da162007 MODULE_TYPE = DXE_SMM_DRIVER VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf b/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf index 8bb04e9495..1e840a5d1e 100644 --- a/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf +++ b/CryptoPkg/Library/BaseCryptLibRuntimeCryptProtocol/BaseCryptLibRuntimeCryptProtocol.inf @@ -6,10 +6,10 @@ # AES/TDES/ARC4 functions, RSA external functions, PKCS#7 SignedData sign/verify # functions, Diffie-Hellman functions, X.509 certificate handler functions, # authenticode signature verification functions, PEM handler functions, -# pseudorandom number generator functions, Sha256Duplicate() are not supported +# pseudorandom number generator functions, and Sha256Duplicate() are not supported # in this instance. # -# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -23,6 +23,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseCryptLibRuntimeCryptProtocol + MODULE_UNI_FILE = BaseCryptLibRuntimeCryptProtocol.uni FILE_GUID = BBB31581-855A-44D7-A550-8A585D9B2DE9 MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf index 08a31ee2c0..0c1f96cd87 100644 --- a/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf +++ b/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -1,7 +1,7 @@ ## @file # Intrinsic Routines Wrapper Library Instance. # -# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseIntrinsicLib + MODULE_UNI_FILE = BaseIntrinsicLib.uni FILE_GUID = 63850097-3E97-4c4f-A52D-C811A0106105 MODULE_TYPE = BASE VERSION_STRING = 1.0 diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 6cfc67d03c..d380158a43 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -1,5 +1,5 @@ ## @file -# OpenSSL Library implementation. +# This module provides openSSL Library implementation. # # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# This program and the accompanying materials @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = OpensslLib + MODULE_UNI_FILE = OpensslLib.uni FILE_GUID = C873A7D0-9824-409f-9B42-2C158B992E69 MODULE_TYPE = BASE VERSION_STRING = 1.0 -- 2.39.2