summaryrefslogtreecommitdiffstats
path: root/SecurityPkg/VariableAuthenticated
diff options
context:
space:
mode:
authorchenc2 <chen.a.chen@intel.com>2017-10-17 15:14:17 +0800
committerZhang, Chao B <chao.b.zhang@intel.com>2017-10-17 16:47:45 +0800
commit0085d619ddfb7ef6b702c721d7eb9d33b0ad45aa (patch)
tree1b30e03f64e3416be2cf767f06ea04ef71750aef /SecurityPkg/VariableAuthenticated
parent5f2b325e4d99bd55e4c4a2dfcfd2f7f3763009a7 (diff)
downloadedk2-0085d619ddfb7ef6b702c721d7eb9d33b0ad45aa.tar.gz
edk2-0085d619ddfb7ef6b702c721d7eb9d33b0ad45aa.tar.bz2
edk2-0085d619ddfb7ef6b702c721d7eb9d33b0ad45aa.zip
SecurityPkg/SecureBootConfigDxe: Fix coding style issue
The change doesn't impact the functionality. Cc: Bi Dandan <dandan.bi@intel.com> Cc: Zhang Chao <chao.b.zhang@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: chenc2 <chen.a.chen@intel.com> Reviewed-by: Bi Dandan <dandan.bi@intel.com> Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Diffstat (limited to 'SecurityPkg/VariableAuthenticated')
-rw-r--r--SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c30
-rw-r--r--SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h14
2 files changed, 22 insertions, 22 deletions
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 3e03be9738..161512a1f4 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -3098,11 +3098,11 @@ DeleteSignatureEx (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
} else {
goto ON_EXIT;
@@ -3149,7 +3149,7 @@ DeleteSignatureEx (
RemainingSize = VariableDataSize;
ListWalker = (EFI_SIGNATURE_LIST *)(VariableData);
- if (DelType == DELETE_SIGNATURE_LIST_ALL) {
+ if (DelType == Delete_Signature_List_All) {
VariableDataSize = 0;
} else {
while ((RemainingSize > 0) && (RemainingSize >= ListWalker->SignatureListSize) && ListIndex < PrivateData->ListIndex) {
@@ -3161,7 +3161,7 @@ DeleteSignatureEx (
ListIndex++;
}
- if (CheckedCount == SIGNATURE_DATA_COUNTS (ListWalker) || DelType == DELETE_SIGNATURE_LIST_ONE) {
+ if (CheckedCount == SIGNATURE_DATA_COUNTS (ListWalker) || DelType == Delete_Signature_List_One) {
RemainingSize -= ListWalker->SignatureListSize;
ListWalker = (EFI_SIGNATURE_LIST *)((UINT8 *)ListWalker + ListWalker->SignatureListSize);
} else {
@@ -3681,13 +3681,13 @@ LoadSignatureList (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
DstFormId = FORMID_SECURE_BOOT_DB_OPTION_FORM;
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
DstFormId = FORMID_SECURE_BOOT_DBX_OPTION_FORM;
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
DstFormId = FORMID_SECURE_BOOT_DBT_OPTION_FORM;
} else {
@@ -4182,11 +4182,11 @@ LoadSignatureData (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
} else {
goto ON_EXIT;
@@ -4584,7 +4584,7 @@ SecureBootCallback (
// From DBX option to the level-1 form, display signature list.
//
case KEY_VALUE_FROM_DBX_TO_LIST_FORM:
- Private->VariableName = VARIABLE_DBX;
+ Private->VariableName = Variable_DBX;
LoadSignatureList (
Private,
LABEL_SIGNATURE_LIST_START,
@@ -4606,7 +4606,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_LIST_ALL, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_List_All, IfrNvData->CheckedDataCount);
}
LoadSignatureList (
@@ -4630,7 +4630,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_LIST_ONE, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_List_One, IfrNvData->CheckedDataCount);
}
LoadSignatureList (
@@ -4654,7 +4654,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_DATA, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_Data, IfrNvData->CheckedDataCount);
}
LoadSignatureList (
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
index 52ad91b002..e8ae992dd2 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
@@ -152,16 +152,16 @@ typedef struct {
} HII_VENDOR_DEVICE_PATH;
typedef enum {
- VARIABLE_DB,
- VARIABLE_DBX,
- VARIABLE_DBT,
- VARIABLE_MAX
+ Variable_DB,
+ Variable_DBX,
+ Variable_DBT,
+ Variable_MAX
} CURRENT_VARIABLE_NAME;
typedef enum {
- DELETE_SIGNATURE_LIST_ALL,
- DELETE_SIGNATURE_LIST_ONE,
- DELETE_SIGNATURE_DATA
+ Delete_Signature_List_All,
+ Delete_Signature_List_One,
+ Delete_Signature_Data
}SIGNATURE_DELETE_TYPE;
typedef struct {