Merge pull request #95 from math07/smallFixes

For native *2john compiled by JtR, set .exe extension on Windows.
openwall · Aug 24, 2015 · 0b10e33 · 0b10e33
2 parents ff16ba2 + 4d894fe
commit 0b10e33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1464,7 +1464,7 @@ void MainWindow::verifyJohnVersion()
     } else {
         bool isJumbo = output.contains("jumbo", Qt::CaseInsensitive);
         QRegExp exp("John the Ripper .+ version (\\S+)[\n| ]", Qt::CaseInsensitive);
-        int pos = exp.indexIn(lines[0]);
+        int pos = exp.indexIn(output);
         if (pos > -1) {
             m_ui->labelJohnPathValidator->setText(tr("Detected John the Ripper ") + exp.cap(1) + (isJumbo ? "" : " (core)"));
         } else if (lines.size() > 0){

diff --git a/src/openotherformatfiledialog.cpp b/src/openotherformatfiledialog.cpp
@@ -326,6 +326,10 @@ void OpenOtherFormatFileDialog::convertFile()
             parameters << runDir + "/"  + scriptFullName;
         } else {
             program = runDir + "/"  + scriptFullName;
+#ifdef Q_OS_WIN
+            if (currentScript.extension.isEmpty())
+                program += ".exe";
+#endif
         }
         // Add the arguments
         for (int i = 0; i < currentScript.parameters.size(); i++) {