Merge branch 'release/v0.6.0'

julian-poidevin · Nov 3, 2017 · b166691 · b166691
2 parents 07171d2 + 6067469
commit b166691
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+## 0.6.0 (November 3rd, 2017)
+#### BugFix
+* Disabled kext signing verification ([#39](https://github.com/julian-poidevin/MBPMid2010_GPUFix/issues/39))
+
+#### Notes
+* Added macOS version to logger ([#40](https://github.com/julian-poidevin/MBPMid2010_GPUFix/issues/40))
+
 ## 0.5.0 (May 21st, 2017)
 #### Features
 * Added donation button ([#17](https://github.com/julian-poidevin/MBPMid2010_GPUFix/issues/17))

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -79,6 +79,8 @@ void MainWindow::on_patchButton_clicked()
             }while(errorOutput.contains("try again"));
 
             logger->write(" ********** Starting MBP GPU Fix **********\n");
+            //Disable signing extension verification
+            disableKextSigning();
             isErrorPatching = patchKernelExtensionFile(&kernelFile);
 #ifndef TEST
             if(isErrorPatching == false)
@@ -93,7 +95,7 @@ void MainWindow::on_patchButton_clicked()
         }
         else
         {
-            logger->write(" ********** Discarded MBP GPU Fix **********n");
+            logger->write(" ********** Discarded MBP GPU Fix **********\n");
             return;
         }
     }
@@ -230,12 +232,15 @@ bool MainWindow::isSIPEnabled(void)
 {
     QString SIPStatus;
     QProcess process;
-    QSysInfo::MacVersion macVersion = QSysInfo::MacintoshVersion;
+    QOperatingSystemVersion macVersion = QOperatingSystemVersion::current();
+
+    logger->write(" | macOS version : \n");
+    logger->write(macVersion.name() + " " + QString::number(macVersion.majorVersion()) + "." +  QString::number(macVersion.minorVersion()) + "\n");
 
     logger->write(" | Checking SIP Status\n");
 
     //SIP as been introduced since El Capitan
-    if(macVersion >= QSysInfo::MV_ELCAPITAN)
+    if(macVersion >= QOperatingSystemVersion::OSXElCapitan)
     {
         //Execute commande line
         process.start("csrutil status");
@@ -271,6 +276,18 @@ bool MainWindow::isSIPEnabled(void)
 #endif
 }
 
+int MainWindow::disableKextSigning()
+{
+    QProcess process;
+    QString command;
+    QStringList arguments;
+
+    logger->write("Disabling Kext Signing verification : ");
+    command = "sudo nvram boot-args=kext-dev-mode=1";
+    arguments.clear();
+    return executeProcess(&process,command,arguments);
+}
+
 int MainWindow::executeProcess(QProcess* process, QString command, QStringList arguments)
 {
     QString errorOutput;

diff --git a/mainwindow.h b/mainwindow.h
@@ -1,7 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#define VERSION "0.5.0"
+#define VERSION "0.6.0"
 #define APP_NAME "MBPMid2010-GPU-Fix"
 
 #include <QMainWindow>
@@ -73,6 +73,7 @@ private slots:
     QDomElement findElementChild(QDomElement parent, const QString &textToFind);
     QDomElement findElementSibling(QDomElement parent, const QString &textToFind);
     bool isSIPEnabled(void);
+    int disableKextSigning(void);
     int executeProcess(QProcess* process,QString command,QStringList arguments);
 };