Fix copyright header and additions to README.

openwall · Aug 24, 2015 · 5296cc7 · 5296cc7
1 parent 0b10e33
commit 5296cc7
Show file tree

Hide file tree

Showing 28 changed files with 125 additions and 77 deletions.
diff --git a/README b/README
@@ -1,20 +1,24 @@
 Overview
 ========
 
-Johnny is a cross-platform GUI frontend for John the Ripper, the popular
-password cracker, written in C++ using the Qt framework.
+Johnny the open source cross-platform GUI frontend for John the Ripper, the
+popular password cracker, written in C++ using the Qt framework.
 
-Johnny's aim is to automate and simplify the password cracking routines as well
-as add extra functionality like session management, using the immense capabilities
-and features offered by John the Ripper.
+Johnny's aim is to automate and simplify the password cracking routine on the
+Desktop as well as add extra functionality like session management and easy
+hash/password management, on top of the immense capabilities and features
+offered by John the Ripper.
 
 The application uses John The Ripper for the actual work, thus it needs to be
-installed on your system. Official core version or the community-enhanced
-version (jumbo) are both supported.
+installed on your system. Official core (proper) version and the
+community-enhanced version (jumbo) are both supported. The latter exposes more
+functionality like extra cracking modes and hash types support.
 
-To download official binaries and find more about Johnny visit:
+To download official binary redistributables and find more about Johnny visit:
 http://openwall.info/wiki/john/johnny
 
-For detailed licensing info see COPYING.
+Johnny is released under the BSD 2-clause license.
+
+For detailed licensing info see COPYING dist-file.
 For version history see CHANGELOG.
 For building and install instructions see INSTALL.
diff --git a/src/hashsortfilterproxymodel.cpp b/src/hashsortfilterproxymodel.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "hashsortfilterproxymodel.h"
@@ -75,8 +77,8 @@ bool HashSortFilterProxyModel::filterAcceptsRow(int sourceRow,
     while ((isAccepted == false) && (currentColumn < m_filteredColumns.count())) {
         index = sourceModel()->index(sourceRow, m_filteredColumns[currentColumn], sourceParent);
         if (sourceModel()->data(index).toString().contains(filterRegExp())) {
-		isAccepted = true;
-	}
+        isAccepted = true;
+    }
         currentColumn++;
     }
     return isAccepted;

diff --git a/src/hashsortfilterproxymodel.h b/src/hashsortfilterproxymodel.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef HASHSORTFILTERPROXYMODEL_H

diff --git a/src/hashtypechecker.cpp b/src/hashtypechecker.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "hashtypechecker.h"

diff --git a/src/hashtypechecker.h b/src/hashtypechecker.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef HASHTYPECHECKER_H

diff --git a/src/johnattack.cpp b/src/johnattack.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "johnattack.h"

diff --git a/src/johnattack.h b/src/johnattack.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef JOHNATTACK_H

diff --git a/src/johnhandler.cpp b/src/johnhandler.cpp
@@ -1,8 +1,9 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
-
 #include "johnhandler.h"
 
 #include <QMetaType>

diff --git a/src/johnhandler.h b/src/johnhandler.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef JOHNHANDLER_H

diff --git a/src/johnprocess.cpp b/src/johnprocess.cpp
@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "johnprocess.h"

diff --git a/src/johnprocess.h b/src/johnprocess.h
@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef JOHNPROCESS_H
@@ -19,7 +20,7 @@
 class JohnProcess : public QProcess
 {
     Q_OBJECT
-    
+
 public:
     JohnProcess();
     ~JohnProcess();

diff --git a/src/johnsession.cpp b/src/johnsession.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "johnsession.h"

diff --git a/src/johnsession.h b/src/johnsession.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef JOHNSESSION_H

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2011, 2015 Shinnok <raydenxy at gmail.com>.
- * Copyright (c) 2011,2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>.  See LICENSE.
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "mainwindow.h"

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011, 2015 Shinnok <admin at shinnok.com>.
- * Copyright (c) 2011, 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>.
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "mainwindow.h"

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011, 2015 Shinnok <admin at shinnok.com>.
- * Copyright (c) 2011, 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>.
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef MAINWINDOW_H

diff --git a/src/menu.cpp b/src/menu.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "menu.h"

diff --git a/src/menu.h b/src/menu.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef MENU_H
@@ -11,7 +13,7 @@
 class Menu : public QMenu
 {
     Q_OBJECT
-    
+
 public:
     Menu(QWidget *parent = 0);
     ~Menu();

diff --git a/src/openotherformatfiledialog.cpp b/src/openotherformatfiledialog.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "openotherformatfiledialog.h"

diff --git a/src/openotherformatfiledialog.h b/src/openotherformatfiledialog.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef OPENOTHERFORMATFILEDIALOG_H

diff --git a/src/passwordfilemodel.cpp b/src/passwordfilemodel.cpp
@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2011,2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>.
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "passwordfilemodel.h"

diff --git a/src/passwordfilemodel.h b/src/passwordfilemodel.h
@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>.
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef PASSWORDFILEMODEL_H

diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "tabwidget.h"

diff --git a/src/tabwidget.h b/src/tabwidget.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef TABWIDGET_H

diff --git a/src/textlabel.cpp b/src/textlabel.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "textlabel.h"

diff --git a/src/textlabel.h b/src/textlabel.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Shinnok <admin at shinnok.com>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef TEXTLABEL_H

diff --git a/src/translator.cpp b/src/translator.cpp
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #include "translator.h"

diff --git a/src/translator.h b/src/translator.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>.
- * See LICENSE for details.
+ * Copyright (c) 2011-2015 Shinnok <admin at shinnok.com>
+ * Parts Copyright (c) 2012 Aleksey Cherepanov <aleksey.4erepanov@gmail.com>
+ * Parts Copyright (c) 2015 Mathieu Laprise <mathieu.laprise@polymtl.ca>
+ * See LICENSE dist-file for details.
  */
 
 #ifndef TRANSLATOR_H