Corrected formatting and cleanup

INSTALL.md

@@ -27,7 +27,6 @@ The following libraries are required:
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
 * libargon2
-* libquazip5
 
 Prepare the Building Environment
 ================================
@@ -100,10 +99,12 @@ These steps place the compiled KeePassXC binary inside the `./build/src/` direct
 	  -DWITH_XC_BROWSER=[ON|OFF] Enable/Disable KeePassXC-Browser extension support (default: OFF)
 	  -DWITH_XC_NETWORKING=[ON|OFF] Enable/Disable Networking support (favicon download) (default: OFF)
 	  -DWITH_XC_SSHAGENT=[ON|OFF] Enable/Disable SSHAgent support (default: OFF)
-	  -DWITH_XC_SHARING=[ON|OFF] Enable/Disable Sharing extension (default: OFF)
+	  -DWITH_XC_KEESHARE=[ON|OFF] Enable/Disable KeeShare group syncronization extension (default: OFF)
 	  -DWITH_XC_TOUCHID=[ON|OFF] (macOS Only) Enable/Disable Touch ID unlock (default:OFF)
 	  -DWITH_XC_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)
 	  
+	  -DWITH_XC_KEESHARE_SECURE=[ON|OFF] Enable/Disable KeeShare secure containers, requires libquazip5 (default: OFF)
+	  
 	  -DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
 	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
 	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)

README.md

@@ -1,10 +1,6 @@
 # <img src="https://keepassxc.org/logo.png" width="40" height="40"/> KeePassXC
 [![TeamCity Build Status](https://ci.keepassxc.org/app/rest/builds/buildType:\(project:KeepassXC\)/statusIcon)](https://ci.keepassxc.org/?guest=1) [![codecov](https://codecov.io/gh/keepassxreboot/keepassxc/branch/develop/graph/badge.svg)](https://codecov.io/gh/keepassxreboot/keepassxc)
 
-
-## Note
-This is a feature fork to introduce the concept of Sharing to KeepPassXC. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
-
 ## About KeePassXC
 [KeePassXC](https://keepassxc.org) is a cross-platform community fork of
 [KeePassX](https://www.keepassx.org/).
@@ -38,7 +34,7 @@ so please check out your distribution's package list to see if KeePassXC is avai
 [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepasshttp-connector/dafgdjggglmmknipkhngniifhplpcldb), and
 [passafari](https://github.com/mmichaa/passafari.safariextension/) in Safari. [[See note about KeePassHTTP]](#note-about-keepasshttp)
 - Browser integration with KeePassXC-Browser using [native messaging](https://developer.chrome.com/extensions/nativeMessaging) for [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser/) and [Google Chrome or Chromium](https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk)
-- Sharing of passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
+- Synchronize passwords using KeeShare. See [Using Sharing](./docs/QUICKSTART.md#using-sharing) for more details.
 - Many bug fixes
 
 For a full list of features and changes, read the [CHANGELOG](CHANGELOG) document.

cmake/FindQuaZip.cmake

@@ -4,15 +4,14 @@
 # QUAZIP_LIBRARIES           - List of QuaZip libraries
 # QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
 
-
+IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
-IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
   # in cache already
   SET(QUAZIP_FOUND TRUE)
-ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
-    IF (Qt5Core_FOUND)
+    IF(Qt5Core_FOUND)
         set(QUAZIP_LIB_VERSION_SUFFIX 5)
     ENDIF()
-  IF (WIN32)
+  IF(WIN32)
     FIND_PATH(QUAZIP_LIBRARY_DIR
       WIN32_DEBUG_POSTFIX d
       NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
@@ -24,11 +23,10 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
     FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
   ELSE(WIN32)
     FIND_PACKAGE(PkgConfig)
-#     pkg_check_modules(PC_QCA2 QUIET qca2)
     pkg_check_modules(PC_QUAZIP quazip)
     FIND_LIBRARY(QUAZIP_LIBRARIES
       WIN32_DEBUG_POSTFIX d
-            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+      NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
       HINTS /usr/lib /usr/lib64
     )
     FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
@@ -36,8 +34,8 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
       PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
     )
     FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
-  ENDIF (WIN32)
+  ENDIF(WIN32)
   INCLUDE(FindPackageHandleStandardArgs)
   SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
   find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
-ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ENDIF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)

snapcraft.yaml

@@ -50,8 +50,6 @@ parts:
       - libsodium-dev
       - libargon2-0-dev
       - libqrencode-dev
-      - libquazip5-dev
-      - libquazip5-headers
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations

src/core/Database.cpp

@@ -476,7 +476,7 @@ bool Database::challengeMasterSeed(const QByteArray& masterSeed)
         m_data.masterSeed = masterSeed;
         return m_data.key->challenge(masterSeed, m_data.challengeResponseKey);
     }
-    return true;
+    return false;
 }
 
 void Database::setCipher(const QUuid& cipher)

src/crypto/CryptoHash.h

@@ -34,7 +34,6 @@ public:
     explicit CryptoHash(Algorithm algo, bool hmac = false);
     ~CryptoHash();
     void addData(const QByteArray& data);
-    void reset();
     QByteArray result() const;
     void setKey(const QByteArray& data);
 

src/crypto/ssh/CMakeLists.txt

@@ -4,9 +4,9 @@ if(WITH_XC_CRYPTO_SSH)
     set(crypto_ssh_SOURCES
         bcrypt_pbkdf.cpp
         blowfish.c
-	    ASN1Key.cpp
+        ASN1Key.cpp
-	    BinaryStream.cpp
+        BinaryStream.cpp
-	    OpenSSHKey.cpp
+        OpenSSHKey.cpp
     )
 
     add_library(crypto_ssh STATIC ${crypto_ssh_SOURCES})

src/gui/AboutDialog.cpp

@@ -28,90 +28,90 @@
 #include <QSysInfo>
 
 AboutDialog::AboutDialog(QWidget* parent)
-	 : QDialog(parent)
+    : QDialog(parent)
-	 , m_ui(new Ui::AboutDialog())
+    , m_ui(new Ui::AboutDialog())
 {
-	 m_ui->setupUi(this);
+    m_ui->setupUi(this);
 
-	 resize(minimumSize());
+    resize(minimumSize());
-	 setWindowFlags(Qt::Sheet);
+    setWindowFlags(Qt::Sheet);
-	 setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-	 m_ui->nameLabel->setText(m_ui->nameLabel->text().replace("${VERSION}", KEEPASSXC_VERSION));
+    m_ui->nameLabel->setText(m_ui->nameLabel->text().replace("${VERSION}", KEEPASSXC_VERSION));
-	 QFont nameLabelFont = m_ui->nameLabel->font();
+    QFont nameLabelFont = m_ui->nameLabel->font();
-	 nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4);
+    nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4);
-	 m_ui->nameLabel->setFont(nameLabelFont);
+    m_ui->nameLabel->setFont(nameLabelFont);
 
-	 m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48));
+    m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48));
 
-	 QString commitHash;
+    QString commitHash;
-	 if (!QString(GIT_HEAD).isEmpty()) {
+    if (!QString(GIT_HEAD).isEmpty()) {
-		  commitHash = GIT_HEAD;
+        commitHash = GIT_HEAD;
-	 } else if (!QString(DIST_HASH).contains("Format")) {
+    } else if (!QString(DIST_HASH).contains("Format")) {
-		  commitHash = DIST_HASH;
+        commitHash = DIST_HASH;
-	 }
+    }
 
-	 QString debugInfo = "KeePassXC - ";
+    QString debugInfo = "KeePassXC - ";
-	 debugInfo.append(tr("Version %1").arg(KEEPASSXC_VERSION).append("\n"));
+    debugInfo.append(tr("Version %1").arg(KEEPASSXC_VERSION).append("\n"));
 #ifndef KEEPASSXC_BUILD_TYPE_RELEASE
-	 debugInfo.append(tr("Build Type: %1").arg(KEEPASSXC_BUILD_TYPE).append("\n"));
+    debugInfo.append(tr("Build Type: %1").arg(KEEPASSXC_BUILD_TYPE).append("\n"));
 #endif
-	 if (!commitHash.isEmpty()) {
+    if (!commitHash.isEmpty()) {
-		  debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n"));
+        debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n"));
-	 }
+    }
 
 #ifdef KEEPASSXC_DIST
-	 debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n"));
+    debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n"));
 #endif
 
-	 debugInfo.append("\n").append(
+    debugInfo.append("\n").append(
-		  QString("%1\n- Qt %2\n- %3\n\n")
+            QString("%1\n- Qt %2\n- %3\n\n")
-				.arg(tr("Libraries:"), QString::fromLocal8Bit(qVersion()), Crypto::backendVersion()));
+                    .arg(tr("Libraries:"), QString::fromLocal8Bit(qVersion()), Crypto::backendVersion()));
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-	 debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4")
+    debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4")
-								 .arg(QSysInfo::prettyProductName(),
+                             .arg(QSysInfo::prettyProductName(),
-										QSysInfo::currentCpuArchitecture(),
+                                  QSysInfo::currentCpuArchitecture(),
-										QSysInfo::kernelType(),
+                                  QSysInfo::kernelType(),
-										QSysInfo::kernelVersion()));
+                                  QSysInfo::kernelVersion()));
 
-	 debugInfo.append("\n\n");
+    debugInfo.append("\n\n");
 #endif
 
-	 QString extensions;
+    QString extensions;
 #ifdef WITH_XC_AUTOTYPE
-	 extensions += "\n- " + tr("Auto-Type");
+    extensions += "\n- " + tr("Auto-Type");
 #endif
 #ifdef WITH_XC_BROWSER
-	 extensions += "\n- " + tr("Browser Integration");
+    extensions += "\n- " + tr("Browser Integration");
 #endif
 #ifdef WITH_XC_SSHAGENT
-	 extensions += "\n- " + tr("SSH Agent");
+    extensions += "\n- " + tr("SSH Agent");
 #endif
 #if defined(WITH_XC_KEESHARE_SECURE) && defined(WITH_XC_KEESHARE_INSECURE)
-	 extensions += "\n- " + tr("KeeShare (signed and unsigned sharing)");
+    extensions += "\n- " + tr("KeeShare (signed and unsigned sharing)");
 #elif defined(WITH_XC_KEESHARE_SECURE)
-	 extensions += "\n- " + tr("KeeShare (only signed sharing)");
+    extensions += "\n- " + tr("KeeShare (only signed sharing)");
 #elif defined(WITH_XC_KEESHARE_INSECURE)
-	 extensions += "\n- " + tr("KeeShare (only unsigned sharing)");
+    extensions += "\n- " + tr("KeeShare (only unsigned sharing)");
 #endif
 #ifdef WITH_XC_YUBIKEY
-	 extensions += "\n- " + tr("YubiKey");
+    extensions += "\n- " + tr("YubiKey");
 #endif
 #ifdef WITH_XC_TOUCHID
-	 extensions += "\n- " + tr("TouchID");
+    extensions += "\n- " + tr("TouchID");
 #endif
 
-	 if (extensions.isEmpty())
+    if (extensions.isEmpty())
-		  extensions = " " + tr("None");
+        extensions = " " + tr("None");
 
-	 debugInfo.append(tr("Enabled extensions:").append(extensions));
+    debugInfo.append(tr("Enabled extensions:").append(extensions));
 
-	 m_ui->debugInfo->setPlainText(debugInfo);
+    m_ui->debugInfo->setPlainText(debugInfo);
 
-	 setAttribute(Qt::WA_DeleteOnClose);
+    setAttribute(Qt::WA_DeleteOnClose);
-	 connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
+    connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
-	 connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard()));
+    connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard()));
 }
 
 AboutDialog::~AboutDialog()
@@ -120,6 +120,6 @@ AboutDialog::~AboutDialog()
 
 void AboutDialog::copyToClipboard()
 {
-	 QClipboard* clipboard = QApplication::clipboard();
+    QClipboard* clipboard = QApplication::clipboard();
-	 clipboard->setText(m_ui->debugInfo->toPlainText());
+    clipboard->setText(m_ui->debugInfo->toPlainText());
 }

src/gui/EntryPreviewWidget.cpp

@@ -30,19 +30,18 @@
 #include "keeshare/KeeShare.h"
 #endif
 
-namespace
+namespace {
-{
 constexpr int GeneralTabIndex = 0;
 }
 
 EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
-        : QWidget(parent)
+    : QWidget(parent)
-        , m_ui(new Ui::EntryPreviewWidget())
+    , m_ui(new Ui::EntryPreviewWidget())
-        , m_locked(false)
+    , m_locked(false)
-        , m_currentEntry(nullptr)
+    , m_currentEntry(nullptr)
-        , m_currentGroup(nullptr)
+    , m_currentGroup(nullptr)
-        , m_selectedTabEntry(0)
+    , m_selectedTabEntry(0)
-        , m_selectedTabGroup(0)
+    , m_selectedTabGroup(0)
 {
     m_ui->setupUi(this);