From 14619cb16efb6aaf30aa1f5e66f051f8cdb7269f Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Fri, 9 Aug 2024 22:20:14 +0200 Subject: [PATCH] Fix typos --- docs/topics/BrowserPlugin.adoc | 4 ++-- src/CMakeLists.txt | 2 +- src/core/Bootstrap.cpp | 2 +- src/core/Merger.h | 4 ++-- src/crypto/SymmetricCipher.cpp | 12 ++++++------ src/crypto/SymmetricCipher.h | 2 +- src/format/OpData01.h | 2 +- src/gui/EditWidgetProperties.ui | 2 +- src/gui/IconDownloader.cpp | 4 ++-- src/gui/Icons.cpp | 6 +++--- src/gui/SearchWidget.cpp | 2 +- src/gui/reports/ReportsWidgetHibp.cpp | 2 +- src/quickunlock/Polkit.cpp | 2 +- src/thirdparty/ykcore/ykcore.c | 2 +- src/thirdparty/ykcore/ykcore.h | 4 ++-- src/thirdparty/ykcore/ykcore_lcl.h | 2 +- src/thirdparty/ykcore/ykdef.h | 4 ++-- src/thirdparty/zxcvbn/zxcvbn.c | 4 ++-- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/topics/BrowserPlugin.adoc b/docs/topics/BrowserPlugin.adoc index 0a8621e9c..0238947b1 100644 --- a/docs/topics/BrowserPlugin.adoc +++ b/docs/topics/BrowserPlugin.adoc @@ -99,11 +99,11 @@ You can then choose to update/add the credentials to your KeePassXC database dir 1. Ensure your database is unlocked and configured to use the Browser extension as shown above. -2. Right click on a password field and from the KeePassXC sub-menu choose _Show Password Generater_. The standard KeePassXC password generator will appear. +2. Right click on a password field and from the KeePassXC sub-menu choose _Show Password Generator_. The standard KeePassXC password generator will appear. 3. Configure the password generation options and click _Apply Password_ when done. The generated password will be filled into the previously selected field. -4. When you have succussfully submitted the password on the website, a popup will appear asking you to either udpate an existing entry or add a new one. +4. When you have successfully submitted the password on the website, a popup will appear asking you to either update an existing entry or add a new one. // tag::advanced[] === Browser statistics diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6d720f482..5e1894105 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -409,7 +409,7 @@ if(WIN32) endif() endif() -# Main Executable Defintion +# Main Executable Definition if(WIN32) include(GenerateProductVersion) generate_product_version( diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp index 4c3458cc6..061cba136 100644 --- a/src/core/Bootstrap.cpp +++ b/src/core/Bootstrap.cpp @@ -167,7 +167,7 @@ namespace Bootstrap goto Cleanup; } - // Retrieve CreaterOwnerRights SID + // Retrieve CreatorOwnerRights SID pOwnerRightsSid = static_cast(HeapAlloc(GetProcessHeap(), 0, pOwnerRightsSidSize)); if (pOwnerRightsSid == nullptr) { goto Cleanup; diff --git a/src/core/Merger.h b/src/core/Merger.h index 75c8da990..9669e89e3 100644 --- a/src/core/Merger.h +++ b/src/core/Merger.h @@ -53,9 +53,9 @@ private: bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod, const int maxItems); void moveEntry(Entry* entry, Group* targetGroup); void moveGroup(Group* group, Group* targetGroup); - // remove an entry without a trace in the deletedObjects - needed for elemination cloned entries + // remove an entry without a trace in the deletedObjects - needed for elimination of cloned entries void eraseEntry(Entry* entry); - // remove an entry without a trace in the deletedObjects - needed for elemination cloned entries + // remove an entry without a trace in the deletedObjects - needed for elimination of cloned entries void eraseGroup(Group* group); ChangeList resolveEntryConflict(const MergeContext& context, const Entry* existingEntry, Entry* otherEntry); ChangeList resolveGroupConflict(const MergeContext& context, const Group* existingGroup, Group* otherGroup); diff --git a/src/crypto/SymmetricCipher.cpp b/src/crypto/SymmetricCipher.cpp index f819bb3ec..33e61aa4f 100644 --- a/src/crypto/SymmetricCipher.cpp +++ b/src/crypto/SymmetricCipher.cpp @@ -63,15 +63,15 @@ bool SymmetricCipher::init(Mode mode, Direction direction, const QByteArray& key return true; } -bool SymmetricCipher::isInitalized() const +bool SymmetricCipher::isInitialized() const { return m_cipher; } bool SymmetricCipher::process(char* data, int len) { - Q_ASSERT(isInitalized()); - if (!isInitalized()) { + Q_ASSERT(isInitialized()); + if (!isInitialized()) { m_error = QObject::tr("Cipher not initialized prior to use."); return false; } @@ -97,8 +97,8 @@ bool SymmetricCipher::process(QByteArray& data) bool SymmetricCipher::finish(QByteArray& data) { - Q_ASSERT(isInitalized()); - if (!isInitalized()) { + Q_ASSERT(isInitialized()); + if (!isInitialized()) { m_error = QObject::tr("Cipher not initialized prior to use."); return false; } @@ -121,7 +121,7 @@ bool SymmetricCipher::finish(QByteArray& data) void SymmetricCipher::reset() { m_error.clear(); - if (isInitalized()) { + if (isInitialized()) { m_cipher.reset(); } } diff --git a/src/crypto/SymmetricCipher.h b/src/crypto/SymmetricCipher.h index e18f623f3..224e8baa9 100644 --- a/src/crypto/SymmetricCipher.h +++ b/src/crypto/SymmetricCipher.h @@ -52,7 +52,7 @@ public: explicit SymmetricCipher() = default; ~SymmetricCipher() = default; - bool isInitalized() const; + bool isInitialized() const; Q_REQUIRED_RESULT bool init(Mode mode, Direction direction, const QByteArray& key, const QByteArray& iv); Q_REQUIRED_RESULT bool process(char* data, int len); Q_REQUIRED_RESULT bool process(QByteArray& data); diff --git a/src/format/OpData01.h b/src/format/OpData01.h index df6a0b442..960c67b1f 100644 --- a/src/format/OpData01.h +++ b/src/format/OpData01.h @@ -22,7 +22,7 @@ /*! * Packages and transports the AgileBits data structure called \c OpData01 - * used to encypt and provide HMAC for encrypted data. + * used to encrypt and provide HMAC for encrypted data. * \sa https://support.1password.com/opvault-design/#opdata01 */ class OpData01 : public QObject diff --git a/src/gui/EditWidgetProperties.ui b/src/gui/EditWidgetProperties.ui index 0caa9ef27..510e4fffa 100644 --- a/src/gui/EditWidgetProperties.ui +++ b/src/gui/EditWidgetProperties.ui @@ -58,7 +58,7 @@ - + Modified: diff --git a/src/gui/IconDownloader.cpp b/src/gui/IconDownloader.cpp index 6f3891772..b07856862 100644 --- a/src/gui/IconDownloader.cpp +++ b/src/gui/IconDownloader.cpp @@ -75,9 +75,9 @@ void IconDownloader::setUrl(const QString& entryUrl) // Determine if host portion of URL is an IP address by resolving it and // searching for a match with the returned address(es). bool hostIsIp = false; - QList hostAddressess = QHostInfo::fromName(fullyQualifiedDomain).addresses(); + QList hostAddresses = QHostInfo::fromName(fullyQualifiedDomain).addresses(); hostIsIp = - std::any_of(hostAddressess.begin(), hostAddressess.end(), [&fullyQualifiedDomain](const QHostAddress& addr) { + std::any_of(hostAddresses.begin(), hostAddresses.end(), [&fullyQualifiedDomain](const QHostAddress& addr) { return addr.toString() == fullyQualifiedDomain; }); diff --git a/src/gui/Icons.cpp b/src/gui/Icons.cpp index 117cfadfb..7cccf406a 100644 --- a/src/gui/Icons.cpp +++ b/src/gui/Icons.cpp @@ -86,8 +86,8 @@ QIcon Icons::trayIcon(bool unlocked) suffix = "-locked"; } - auto iconApperance = trayIconAppearance(); - if (!iconApperance.startsWith("monochrome")) { + auto iconAppearance = trayIconAppearance(); + if (!iconAppearance.startsWith("monochrome")) { return icon(QString("%1%2").arg(applicationIconName(), suffix), false); } @@ -99,7 +99,7 @@ QIcon Icons::trayIcon(bool unlocked) i = icon(QString("keepassxc-monochrome-dark%1").arg(suffix), false); } #else - i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, suffix), false); + i = icon(QString("%1-%2%3").arg(applicationIconName(), iconAppearance, suffix), false); #endif // Set as mask to allow the operating system to recolour the tray icon. This may look weird // if we failed to detect the status bar background colour correctly, but it is certainly diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp index 36a348365..a504518bc 100644 --- a/src/gui/SearchWidget.cpp +++ b/src/gui/SearchWidget.cpp @@ -97,7 +97,7 @@ bool SearchWidget::eventFilter(QObject* obj, QEvent* event) } else if (keyEvent->matches(QKeySequence::Copy)) { // If the system Copy shortcut (typically Ctrl+C or Cmd+C) is pressed // in the search edit when no text is selected, route the event to the - // main window. With the default shorcut configuration, this will copy + // main window. With the default shortcut configuration, this will copy // the password of the current entry to the clipboard. if (!m_ui->searchEdit->hasSelectedText()) { // Prevent infinite recursion, in case the main window ends up diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp index dccaa4c51..201b1010f 100644 --- a/src/gui/reports/ReportsWidgetHibp.cpp +++ b/src/gui/reports/ReportsWidgetHibp.cpp @@ -133,7 +133,7 @@ void ReportsWidgetHibp::makeHibpTable() } } - // Sort decending by the number the password has been exposed + // Sort descending by the number the password has been exposed std::sort(items.begin(), items.end(), [](QPair& lhs, QPair& rhs) { return lhs.second > rhs.second; }); diff --git a/src/quickunlock/Polkit.cpp b/src/quickunlock/Polkit.cpp index 38b9380d6..d73a7c71b 100644 --- a/src/quickunlock/Polkit.cpp +++ b/src/quickunlock/Polkit.cpp @@ -49,7 +49,7 @@ Polkit::Polkit() PolkitSubject::registerMetaType(); PolkitAuthorizationResults::registerMetaType(); - /* Note we explicitly use our own dbus path here, as the ::systemBus() method could be overriden + /* Note we explicitly use our own dbus path here, as the ::systemBus() method could be overridden through an environment variable to return an alternative bus path. This bus could have an application pretending to be polkit running on it, which could approve every authentication request diff --git a/src/thirdparty/ykcore/ykcore.c b/src/thirdparty/ykcore/ykcore.c index cfab2425a..c4fc4f4d4 100644 --- a/src/thirdparty/ykcore/ykcore.c +++ b/src/thirdparty/ykcore/ykcore.c @@ -155,7 +155,7 @@ int yk_get_status(YK_KEY *k, YK_STATUS *status) } /* Read the factory programmed serial number from a YubiKey. - * The possibility to retreive the serial number might be disabled + * The possibility to retrieve the serial number might be disabled * using configuration, so it should not be considered a fatal error * to not be able to read the serial number using this function. * diff --git a/src/thirdparty/ykcore/ykcore.h b/src/thirdparty/ykcore/ykcore.h index 37e34e1f3..e0f3db5e3 100644 --- a/src/thirdparty/ykcore/ykcore.h +++ b/src/thirdparty/ykcore/ykcore.h @@ -78,7 +78,7 @@ extern int yk_release(void); * Functions to get and release the key itself. * ****/ -/* opens first key available. For backwards compatability */ +/* opens first key available. For backwards compatibility */ extern YK_KEY *yk_open_first_key(void); extern YK_KEY *yk_open_key(int); /* opens nth key available */ extern YK_KEY *yk_open_key_vid_pid(const int*, size_t, const int*, size_t, int); @@ -147,7 +147,7 @@ int yk_write_device_info(YK_KEY *yk, unsigned char *buf, unsigned int len); /************************************************************************* * - * Error handling fuctions + * Error handling functions * ****/ extern int * _yk_errno_location(void); diff --git a/src/thirdparty/ykcore/ykcore_lcl.h b/src/thirdparty/ykcore/ykcore_lcl.h index 53619acb9..783c1bfff 100644 --- a/src/thirdparty/ykcore/ykcore_lcl.h +++ b/src/thirdparty/ykcore/ykcore_lcl.h @@ -48,7 +48,7 @@ ** ** = = = = = = = = = B I G F A T W A R N I N G = = = = = = = = = ** - ** DO NOT USE THE FOLLOWING FUCTIONS DIRECTLY UNLESS YOU WRITE CORE ROUTINES! + ** DO NOT USE THE FOLLOWING FUNCTIONS DIRECTLY UNLESS YOU WRITE CORE ROUTINES! ** ** These functions are declared here only to make sure they get defined ** correctly internally. diff --git a/src/thirdparty/ykcore/ykdef.h b/src/thirdparty/ykcore/ykdef.h index b645dd996..80cdce6c9 100644 --- a/src/thirdparty/ykcore/ykdef.h +++ b/src/thirdparty/ykcore/ykdef.h @@ -146,7 +146,7 @@ struct config_st { /* Yubikey 2 and above */ #define CFGFLAG_SHORT_TICKET 0x02 /* Send truncated ticket (half length) */ #define CFGFLAG_STRONG_PW1 0x10 /* Strong password policy flag #1 (mixed case) */ -#define CFGFLAG_STRONG_PW2 0x40 /* Strong password policy flag #2 (subtitute 0..7 to digits) */ +#define CFGFLAG_STRONG_PW2 0x40 /* Strong password policy flag #2 (substitute 0..7 to digits) */ #define CFGFLAG_MAN_UPDATE 0x80 /* Allow manual (local) update of static OTP */ /* Yubikey 2.1 and above */ @@ -299,7 +299,7 @@ struct status_st { #define YK4_CAPA_TAG 0x01 /* TAG for capabilities */ #define YK4_SERIAL_TAG 0x02 /* TAG for serial number */ -#define YK4_CAPA1_OTP 0x01 /* Capability bit for OTP functonality */ +#define YK4_CAPA1_OTP 0x01 /* Capability bit for OTP functionality */ #define YK4_CAPA1_U2F 0x02 /* Capability bit for U2F functionality */ #define YK4_CAPA1_CCID 0x04 /* Capability bit for CCID functionality */ #define YK4_CAPA1_OPGP 0x08 /* Capability bit for OpenPGP functionality */ diff --git a/src/thirdparty/zxcvbn/zxcvbn.c b/src/thirdparty/zxcvbn/zxcvbn.c index 9d355a2e2..28d53af22 100644 --- a/src/thirdparty/zxcvbn/zxcvbn.c +++ b/src/thirdparty/zxcvbn/zxcvbn.c @@ -1244,7 +1244,7 @@ static const char *Formats[] = 0 }; /* Possible separator characters that could be used */ -static const char DateSeperators[] = "/\\-_. "; +static const char DateSeparators[] = "/\\-_. "; /********************************************************************************** * Try to match the password with the formats above. @@ -1273,7 +1273,7 @@ static void DateMatch(ZxcMatch_t **Result, const uint8_t *Passwd, int Start, int { if (*Fmt == '?') { - if (!Sep && strchr(DateSeperators, *p)) + if (!Sep && strchr(DateSeparators, *p)) Sep = *p; Fail = (*p != Sep); }