Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/SecureBootConfigDxe/SecureBootConfig.vfr

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• OvmfPkg/SecureBootConfigDxe/SecureBootConfig.vfr (modified) (31 diffs)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/SecureBootConfigDxe/SecureBootConfig.vfr

@@ -3 +3 @@
 
 Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
-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 
+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, 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -25 +25 @@
     name  = SECUREBOOT_CONFIGURATION,
     guid  = SECUREBOOT_CONFIG_FORM_SET_GUID;
-  
+
   //
   // ##1 Form "Secure Boot Configuration"
@@ -33 +33 @@
 
     subtitle text = STRING_TOKEN(STR_NULL);
-    
+
     //
     // Define of Check Box: Attempt Secure Boot
@@ -42 +42 @@
               help     = STRING_TOKEN(STR_NULL),
       endcheckbox;
-    endif;  
-    
+    endif;
+
     //
     // Display of Check Box: Attempt Secure Boot
@@ -55 +55 @@
     endcheckbox;
     endif;
-    
+
     //
     // Display of Oneof: 'Secure Boot Mode'
     //
     oneof varid  = SECUREBOOT_CONFIGURATION.SecureBootMode,
-          questionid = KEY_SECURE_BOOT_MODE,      
+          questionid = KEY_SECURE_BOOT_MODE,
           prompt = STRING_TOKEN(STR_SECURE_BOOT_MODE_PROMPT),
           help   = STRING_TOKEN(STR_SECURE_BOOT_MODE_HELP),
@@ -67 +67 @@
           option text = STRING_TOKEN(STR_CUSTOM_MODE),      value = SECURE_BOOT_MODE_CUSTOM,   flags = 0;
     endoneof;
-    
+
     //
     //
@@ -82 +82 @@
     endif;
   endform;
-  
+
   //
   // ##2 Form: 'Custom Secure Boot Options'
@@ -88 +88 @@
   form formid = FORMID_SECURE_BOOT_OPTION_FORM,
     title  = STRING_TOKEN(STR_SECURE_BOOT_OPTION_TITLE);
-    
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
     goto FORMID_SECURE_BOOT_PK_OPTION_FORM,
          prompt = STRING_TOKEN(STR_SECURE_BOOT_PK_OPTION),
@@ -96 +96 @@
          flags  = INTERACTIVE,
          key    = KEY_SECURE_BOOT_PK_OPTION;
-        
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
     goto FORMID_SECURE_BOOT_KEK_OPTION_FORM,
          prompt = STRING_TOKEN(STR_SECURE_BOOT_KEK_OPTION),
@@ -104 +104 @@
          flags  = INTERACTIVE,
          key    = KEY_SECURE_BOOT_KEK_OPTION;
-        
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
     goto FORMID_SECURE_BOOT_DB_OPTION_FORM,
          prompt = STRING_TOKEN(STR_SECURE_BOOT_DB_OPTION),
@@ -112 +112 @@
          flags  = INTERACTIVE,
          key    = KEY_SECURE_BOOT_DB_OPTION;
-    
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
     goto FORMID_SECURE_BOOT_DBX_OPTION_FORM,
          prompt = STRING_TOKEN(STR_SECURE_BOOT_DBX_OPTION),
@@ -122 +122 @@
 
   endform;
-  
+
   //
   // ##3 Form: 'PK Options'
@@ -128 +128 @@
   form formid = FORMID_SECURE_BOOT_PK_OPTION_FORM,
     title  = STRING_TOKEN(STR_SECURE_BOOT_PK_OPTION);
-    
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
     //
     // Define of Check Box: 'Delete PK'
@@ -140 +140 @@
       endcheckbox;
     endif;
-    
+
     grayoutif ideqval SECUREBOOT_CONFIGURATION.HasPk == 1;
     goto FORMID_ENROLL_PK_FORM,
@@ -148 +148 @@
          key    = KEY_ENROLL_PK;
     endif;
-    
-    subtitle text = STRING_TOKEN(STR_NULL);
-   
-    //
-    // Display of Check Box: 'Delete Pk' 
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
+    //
+    // Display of Check Box: 'Delete Pk'
     //
     grayoutif ideqval SECUREBOOT_CONFIGURATION.HideSecureBoot == 1;
     checkbox varid = SECUREBOOT_CONFIGURATION.DeletePk,
           questionid = KEY_SECURE_BOOT_DELETE_PK,
-          prompt = STRING_TOKEN(STR_DELETE_PK),          
+          prompt = STRING_TOKEN(STR_DELETE_PK),
           help   = STRING_TOKEN(STR_DELETE_PK_HELP),
           flags  = INTERACTIVE,
@@ -163 +163 @@
     endif;
   endform;
-  
+
   //
   // ##4 Form: 'Enroll PK'
@@ -169 +169 @@
   form formid = FORMID_ENROLL_PK_FORM,
     title  = STRING_TOKEN(STR_ENROLL_PK);
-    
+
     subtitle text = STRING_TOKEN(STR_NULL);
 
@@ -178 +178 @@
          key = SECUREBOOT_ADD_PK_FILE_FORM_ID;
   endform;
-  
+
   //
   // ##5 Form: 'KEK Options'
@@ -186 +186 @@
 
     //
-    // Display of 'Enroll KEK' 
+    // Display of 'Enroll KEK'
     //
     goto FORMID_ENROLL_KEK_FORM,
@@ -192 +192 @@
          help   = STRING_TOKEN(STR_ENROLL_KEK_HELP),
          flags  = INTERACTIVE;
-    
-    subtitle text = STRING_TOKEN(STR_NULL);     
-   
-    //
-    // Display of 'Delete KEK' 
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
+    //
+    // Display of 'Delete KEK'
     //
     goto FORMID_DELETE_KEK_FORM,
@@ -203 +203 @@
          flags  = INTERACTIVE,
          key    = KEY_DELETE_KEK;
-  
-    subtitle text = STRING_TOKEN(STR_NULL);    
-  endform;
-
-  //
-  // ##6 Form: 'Enroll KEK' 
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+  endform;
+
+  //
+  // ##6 Form: 'Enroll KEK'
   //
   form formid = FORMID_ENROLL_KEK_FORM,
@@ -243 +243 @@
       flags  = INTERACTIVE,
       key    = KEY_VALUE_SAVE_AND_EXIT_KEK;
- 
+
     goto FORMID_SECURE_BOOT_OPTION_FORM,
       prompt = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
@@ -254 +254 @@
   //
   // ##7 Form: 'Delete KEK'
-  //  
+  //
   form formid = FORMID_DELETE_KEK_FORM,
     title  = STRING_TOKEN(STR_DELETE_KEK_TITLE);
@@ -260 +260 @@
     label LABEL_KEK_DELETE;
     label LABEL_END;
-         
-    subtitle text = STRING_TOKEN(STR_NULL);
-    
+
+    subtitle text = STRING_TOKEN(STR_NULL);
+
   endform;
 
@@ -285 +285 @@
     flags  = INTERACTIVE,
     key    = SECUREBOOT_DELETE_SIGNATURE_FROM_DB;
-    
+
   endform;
 
@@ -320 +320 @@
     label LABEL_END;
     subtitle text = STRING_TOKEN(STR_NULL);
-    
+
   endform;
 
@@ -332 +332 @@
     label LABEL_END;
     subtitle text = STRING_TOKEN(STR_NULL);
-    
+
   endform;
 
@@ -371 +371 @@
          flags  = INTERACTIVE,
          key    = KEY_VALUE_SAVE_AND_EXIT_DB;
- 
+
     goto FORMID_SECURE_BOOT_OPTION_FORM,
          prompt = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
@@ -416 +416 @@
          flags  = INTERACTIVE,
          key    = KEY_VALUE_SAVE_AND_EXIT_DBX;
- 
+
     goto FORMID_SECURE_BOOT_OPTION_FORM,
          prompt = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
@@ -434 +434 @@
        label LABEL_END;
   endform;
-  
+
   //
   // File Explorer for KEK
@@ -474 +474 @@
     label SECUREBOOT_ADD_PK_FILE_FORM_ID;
     label LABEL_END;
-    
+
     subtitle text = STRING_TOKEN(STR_NULL);