Code scrub for the following drivers and librarys.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7172 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 19 insertions, 111 deletions

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index aa86fdf301..ac3ab297ab 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
@@ -1,5 +1,5 @@
 /** @file

-  This driver implements one sample platform security service, which does 

+  This driver implements a sample platform security service, which does 

   nothing and always return EFI_SUCCESS.

   

   Copyright (c) 2006 - 2008, Intel Corporation                                              

@@ -14,21 +14,17 @@
 **/

 

 

-#include "SecurityStub.h"

+#include <Uefi.h>

+#include <Protocol/Security.h>

+#include <Library/DebugLib.h>

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/UefiDriverEntryPoint.h>

 

 //

 // Handle for the Security Architectural Protocol instance produced by this driver

 //

 EFI_HANDLE                  mSecurityArchProtocolHandle = NULL;

 

-//

-// Security Architectural Protocol instance produced by this driver

-//

-EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = { 

-  SecurityStubAuthenticateState 

-};

-

-

 /**

   The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific 

   policy from the DXE core response to an attempt to use a file that returns a 

@@ -61,7 +57,7 @@ EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = {
   @param  File             This is a pointer to the device path of the file that is

                            being dispatched. This will optionally be used for logging.

 

-  @retval EFI_SUCCESS            Do nothing and return.

+  @retval EFI_SUCCESS            Do nothing and return success.

   @retval EFI_INVALID_PARAMETER  File is NULL.

 **/

 EFI_STATUS

@@ -79,14 +75,18 @@ SecurityStubAuthenticateState (
   return EFI_SUCCESS;

 }

 

+//

+// Security Architectural Protocol instance produced by this driver

+//

+EFI_SECURITY_ARCH_PROTOCOL  mSecurityStub = { 

+  SecurityStubAuthenticateState 

+};

 

 /**

-  The user Entry Point installs SAP. The user code starts with this function

-  as the real entry point for the image goes into a library that calls this 

-  function.

+  Installs Security Architectural Protocol.

 

-  @param ImageHandle    The firmware allocated handle for the EFI image.  

-  @param SystemTable    A pointer to the EFI System Table.

+  @param  ImageHandle  The image handle of this driver.

+  @param  SystemTable  A pointer to the EFI System Table.

   

   @retval EFI_SUCCESS   Install the sample Security Architectural Protocol successfully.

 

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
deleted file mode 100644
index ff4f9bcf5d..0000000000
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/** @file

-  Inlcude the required definitions for Security Architectural Protocol stub driver

-

-  Copyright (c) 2006 - 2008, 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        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-**/

-

-#ifndef __SECURITY_STUB_ARCH_PROTOCOL_H__

-#define __SECURITY_STUB_ARCH_PROTOCOL_H__

-

-

-//

-// Common header files for this module.

-//

-#include <Uefi.h>

-#include <Protocol/Security.h>

-#include <Library/DebugLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-

-//

-// Function prototypes

-//

-/**

-  The EFI_SECURITY_ARCH_PROTOCOL (SAP) is used to abstract platform-specific 

-  policy from the DXE core response to an attempt to use a file that returns a 

-  given status for the authentication check from the section extraction protocol.  

-

-  The possible responses in a given SAP implementation may include locking 

-  flash upon failure to authenticate, attestation logging for all signed drivers, 

-  and other exception operations.  The File parameter allows for possible logging 

-  within the SAP of the driver.

-

-  If File is NULL, then EFI_INVALID_PARAMETER is returned.

-

-  If the file specified by File with an authentication status specified by 

-  AuthenticationStatus is safe for the DXE Core to use, then EFI_SUCCESS is returned.

-

-  If the file specified by File with an authentication status specified by 

-  AuthenticationStatus is not safe for the DXE Core to use under any circumstances, 

-  then EFI_ACCESS_DENIED is returned.

-

-  If the file specified by File with an authentication status specified by 

-  AuthenticationStatus is not safe for the DXE Core to use right now, but it 

-  might be possible to use it at a future time, then EFI_SECURITY_VIOLATION is 

-  returned.

-

-  @param  This             The EFI_SECURITY_ARCH_PROTOCOL instance.

-  @param  AuthenticationStatus 

-                           This is the authentication type returned from the Section

-                           Extraction protocol. See the Section Extraction Protocol

-                           Specification for details on this type.

-  @param  File             This is a pointer to the device path of the file that is

-                           being dispatched. This will optionally be used for logging.

-

-  @retval EFI_SUCCESS            Do nothing and return.

-  @retval EFI_INVALID_PARAMETER  File is NULL.

-**/

-EFI_STATUS

-EFIAPI

-SecurityStubAuthenticateState (

-  IN CONST EFI_SECURITY_ARCH_PROTOCOL    *This,

-  IN UINT32                              AuthenticationStatus,

-  IN CONST EFI_DEVICE_PATH_PROTOCOL      *File

-  );

-

-/**

-  The user Entry Point for DXE driver. The user code starts with this function

-  as the real entry point for the image goes into a library that calls this 

-  function.

-

-  @param ImageHandle    The firmware allocated handle for the EFI image.  

-  @param SystemTable    A pointer to the EFI System Table.

-  

-  @retval EFI_SUCCESS   Install the sample Security Architectural Protocol successfully.

-

-**/

-EFI_STATUS

-EFIAPI

-SecurityStubInitialize (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-#endif

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
index 8d70dbe38c..71c5a8ef38 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
@@ -1,5 +1,6 @@
 #/** @file

-#  Sample SecurityStub module implements the dummy platform security service.

+#  Sample SecurityStub driver implements the dummy platform security service.

+#  It always return success without any authentication check.

 #

 #  Copyright (c) 2006 - 2008, Intel Corporation

 #  All rights reserved. This program and the accompanying materials

@@ -28,7 +29,6 @@
 

 [Sources.common]

   SecurityStub.c

-  SecurityStub.h

 

 [Packages]

   MdePkg/MdePkg.dec

@@ -42,4 +42,4 @@
   gEfiSecurityArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED

 

 [Depex]

-  TRUE
\ No newline at end of file
+  TRUE