Changeset 99401 in vbox

Timestamp:

Apr 14, 2023 2:03:32 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156851

Message:

Validation Kit/vboxwrappers: Also enroll MOKs for Secure Boot for 7.0 builds >= r156564 when Secure Boot is enabled; otherwise Guest Additions tests will fail. Warn for older 7.0 builds.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1247 +1247 @@
                     self.o.machine.nonVolatileStore.uefiVariableStore.enrollDefaultMsSignatures();
                     self.o.machine.nonVolatileStore.uefiVariableStore.enrollOraclePlatformKey();
-                    if   sUefiMokPathPrefix is not None \
-                    and  self.fpApiVer >= 7.1:
-                        sFullName = self.oTstDrv.getFullResourceName(sUefiMokPathPrefix) + '.der';
-                        with open(sFullName, "rb") as der_file:
-                            self.o.machine.nonVolatileStore.uefiVariableStore.addSignatureToMok(bytearray(der_file.read()), \
-                                                                                                uuid.uuid4().hex, \
-                                                                                                vboxcon.SignatureType_X509);
+                    if sUefiMokPathPrefix:
+                        if self.oTstDrv.uRevision >= 156314: # Backported IUefiVariableStore::addSignatureToMok() to 7.0.
+                            sFullName = self.oTstDrv.getFullResourceName(sUefiMokPathPrefix) + '.der';
+                            with open(sFullName, "rb") as der_file:
+                                self.o.machine.nonVolatileStore.uefiVariableStore.addSignatureToMok(bytearray(der_file.read()), \
+                                                                                                    uuid.uuid4().hex, \
+                                                                                                    vboxcon.SignatureType_X509);
+                        else:
+                            reporter.log('Warning: Enrolling own keys / signatures only available for 7.0 >= r156314. ' \
+                                         'Guest Additions installation might fail!');
 
                 self.o.machine.nonVolatileStore.uefiVariableStore.secureBootEnabled = fEnable;