Attachment #872719 for bug #1219890

View | Details | Raw Unified | Return to bug 1219890
Collapse All | Expand All




  EFI_HANDLE                      ConInHandle;
  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *OldConIn;
  SPLIT_LIST                      *Split;
  UINT8                           SetupMode;

  //
  // Check for Secure Boot mode
  //
  if (IsSecureBootEnabled()) {
    Status = GetSetupMode (&SetupMode);
    if (EFI_ERROR (Status)) {
        return (Status);
    }
    if (SetupMode != 1) {
      return (EFI_SECURITY_VIOLATION);
    }
  }

  if (PcdGet8 (PcdShellSupportLevel) > 3) {
    return (EFI_UNSUPPORTED);




#define _SHELL_INTERNAL_HEADER_

#include <Uefi.h>
#include <UefiSecureBoot.h>

#include <Guid/ShellVariableGuid.h>
#include <Guid/ShellAliasGuid.h>
#include <Guid/ImageAuthentication.h>

#include <Protocol/LoadedImage.h>
#include <Protocol/SimpleTextOut.h>

#include <Library/HandleParsingLib.h>
#include <Library/FileHandleLib.h>
#include <Library/UefiHiiServicesLib.h>
#include <Library/SecureBootVariableLib.h>

#include "ShellParametersProtocol.h"
#include "ShellProtocol.h"

Lines 47-52 Link Here

(-)a/ShellPkg/Application/Shell/Shell.inf (+2 lines)
47	MdePkg/MdePkg.dec	47	MdePkg/MdePkg.dec
48	ShellPkg/ShellPkg.dec	48	ShellPkg/ShellPkg.dec
49	MdeModulePkg/MdeModulePkg.dec	49	MdeModulePkg/MdeModulePkg.dec
		50	SecurityPkg/SecurityPkg.dec
50		51
51	[LibraryClasses]	52	[LibraryClasses]
52	BaseLib	53	BaseLib
Lines 66-71 Link Here
66	SortLib	67	SortLib
67	HandleParsingLib	68	HandleParsingLib
68	UefiHiiServicesLib	69	UefiHiiServicesLib
		70	SecureBootVariableLib
69		71
70	[Guids]	72	[Guids]
71	gShellVariableGuid ## SOMETIMES_CONSUMES ## GUID	73	gShellVariableGuid ## SOMETIMES_CONSUMES ## GUID

Lines 64-69 Link Here

(-)a/ShellPkg/ShellPkg.dsc (+1 lines)
64	DxeServicesTableLib\|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf	64	DxeServicesTableLib\|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
65	DxeServicesLib\|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf	65	DxeServicesLib\|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
66	ReportStatusCodeLib\|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf	66	ReportStatusCodeLib\|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
		67	SecureBootVariableLib\|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf
67		68
68	[LibraryClasses.ARM,LibraryClasses.AARCH64]	69	[LibraryClasses.ARM,LibraryClasses.AARCH64]
69	#	70	#

Return to bug 1219890

Lines 357-362 UefiMain ( Link Here

(-)a/ShellPkg/Application/Shell/Shell.c (+14 lines)
357	EFI_HANDLE ConInHandle;	357	EFI_HANDLE ConInHandle;
358	EFI_SIMPLE_TEXT_INPUT_PROTOCOL *OldConIn;	358	EFI_SIMPLE_TEXT_INPUT_PROTOCOL *OldConIn;
359	SPLIT_LIST *Split;	359	SPLIT_LIST *Split;
		360	UINT8 SetupMode;
		361
		362	//
		363	// Check for Secure Boot mode
		364	//
		365	if (IsSecureBootEnabled()) {
		366	Status = GetSetupMode (&SetupMode);
		367	if (EFI_ERROR (Status)) {
		368	return (Status);
		369	}
		370	if (SetupMode != 1) {
		371	return (EFI_SECURITY_VIOLATION);
		372	}
		373	}
360		374
361	if (PcdGet8 (PcdShellSupportLevel) > 3) {	375	if (PcdGet8 (PcdShellSupportLevel) > 3) {
362	return (EFI_UNSUPPORTED);	376	return (EFI_UNSUPPORTED);

Lines 11-19 Link Here

(-)a/ShellPkg/Application/Shell/Shell.h (+3 lines)
11	#define _SHELL_INTERNAL_HEADER_	11	#define _SHELL_INTERNAL_HEADER_
12		12
13	#include <Uefi.h>	13	#include <Uefi.h>
		14	#include <UefiSecureBoot.h>
14		15
15	#include <Guid/ShellVariableGuid.h>	16	#include <Guid/ShellVariableGuid.h>
16	#include <Guid/ShellAliasGuid.h>	17	#include <Guid/ShellAliasGuid.h>
		18	#include <Guid/ImageAuthentication.h>
17		19
18	#include <Protocol/LoadedImage.h>	20	#include <Protocol/LoadedImage.h>
19	#include <Protocol/SimpleTextOut.h>	21	#include <Protocol/SimpleTextOut.h>
Lines 42-47 Link Here
42	#include <Library/HandleParsingLib.h>	44	#include <Library/HandleParsingLib.h>
43	#include <Library/FileHandleLib.h>	45	#include <Library/FileHandleLib.h>
44	#include <Library/UefiHiiServicesLib.h>	46	#include <Library/UefiHiiServicesLib.h>
		47	#include <Library/SecureBootVariableLib.h>
45		48
46	#include "ShellParametersProtocol.h"	49	#include "ShellParametersProtocol.h"
47	#include "ShellProtocol.h"	50	#include "ShellProtocol.h"