From 89b7c6beeab5337f1bbd03005ce02ea82b9702ee Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Fri, 28 Mar 2025 18:07:00 +0100 Subject: [PATCH] codespell: Fix spelling issues, no functional changes --- INSTALL.docker | 2 +- README.md | 2 +- cmake/openssl_v_err.cmake | 2 +- doc/CMakeLists.txt | 2 +- doc/rst/revocationlist.rst | 2 +- lang/CMakeLists.txt | 2 +- lib/database_schema.cpp | 2 +- lib/db_x509.cpp | 4 ++-- lib/entropy.cpp | 2 +- lib/main.cpp | 2 +- lib/pki_base.cpp | 4 ++-- lib/pki_evp.cpp | 4 ++-- lib/pki_x509req.cpp | 2 +- release/git.release | 2 +- release/git.release.something | 2 +- widgets/MainWindow.cpp | 8 ++++---- widgets/NewX509.cpp | 2 +- widgets/SearchPkcs11.cpp | 8 ++++---- widgets/XcaApplication.cpp | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/INSTALL.docker b/INSTALL.docker index 5649d13e..76cd1be6 100644 --- a/INSTALL.docker +++ b/INSTALL.docker @@ -24,7 +24,7 @@ option to add options. CODENAME : code name of ubuntu version example: --build-arg CODENAME=jammy -PARALLELMFLAGS : make flags for parralel build +PARALLELMFLAGS : make flags for parallel build example: --build-arg PARALLELMFLAGS=-j2 Run XCA diff --git a/README.md b/README.md index 3755e39d..3fec3b88 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ## __Changelog:__ -A detailled changelog can be found here: +A detailed changelog can be found here: diff --git a/cmake/openssl_v_err.cmake b/cmake/openssl_v_err.cmake index e7d22b8e..21fb9c09 100644 --- a/cmake/openssl_v_err.cmake +++ b/cmake/openssl_v_err.cmake @@ -1,4 +1,4 @@ -# CMake function to find the headerfile x509_vfy.h and search for all occurrances +# CMake function to find the headerfile x509_vfy.h and search for all occurrences # of X509_V_ERR_ and replace them by #ifdef x V_ERR(x) #endif if (OPENSSL_INCLUDE_DIR) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 4f6404a1..75e56f14 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -152,7 +152,7 @@ if(SPHINX) endif() else() - message(WARNING "Application 'qhelpgenerator' not found. In-app documentation disabed.") + message(WARNING "Application 'qhelpgenerator' not found. In-app documentation disabled.") endif() else(SPHINX) message(WARNING "sphinx-build binary not found. Documentation generation disabled") diff --git a/doc/rst/revocationlist.rst b/doc/rst/revocationlist.rst index 8d16fc75..a83ed8e5 100644 --- a/doc/rst/revocationlist.rst +++ b/doc/rst/revocationlist.rst @@ -39,7 +39,7 @@ There is also a commandline option to issue a CRL: CRL Export ---------- -Cetificate Revocation Lists can be exported by the context-menu or by the button on the right. +Certificate Revocation Lists can be exported by the context-menu or by the button on the right. - **Clipboard** Writes all selected requests in PEM format to the Clipboard. - **File:** Write the request into a file. diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index fb6ff656..c3f2a9a2 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -32,7 +32,7 @@ if (${QT_VERSION} VERSION_LESS 6.0.0) else() qt5_add_translation(QM_FILES ${TS_FILES} OPTIONS -silent) endif() - message(STATUS "Updating translations from source with 'lupdate' only supprted with QT6") + message(STATUS "Updating translations from source with 'lupdate' only supported with QT6") target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${QM_FILES}) else() get_target_property(LIBSRC xcalib SOURCES) diff --git a/lib/database_schema.cpp b/lib/database_schema.cpp index 7ae53845..51862712 100644 --- a/lib/database_schema.cpp +++ b/lib/database_schema.cpp @@ -15,7 +15,7 @@ * and then Base64 encode that. * So finally this is PEM without newlines, header and footer * - * Dates are alway stored as 'CHAR(15)' in the + * Dates are always stored as 'CHAR(15)' in the * ASN.1 Generalized time 'yyyyMMddHHmmssZ' format */ diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp index fe9c088f..ea5b8ac1 100644 --- a/lib/db_x509.cpp +++ b/lib/db_x509.cpp @@ -375,7 +375,7 @@ void db_x509::newItem() NewX509 *dlg = new NewX509(); dlg->setCert(); pki_x509 *sigcert = Store.lookupPki(selected); - qDebug() << "SIGCERT" << (sigcert ? sigcert->getIntName() : "NULLL"); + qDebug() << "SIGCERT" << (sigcert ? sigcert->getIntName() : "NULL"); dlg->defineSigner(sigcert, true); if (dlg->exec()) { newCert(dlg); @@ -387,7 +387,7 @@ void db_x509::newCert(pki_x509req *req) { NewX509 *dlg = new NewX509(); pki_x509 *sigcert = Store.lookupPki(selected); - qDebug() << "SIGCERT" << (sigcert ? sigcert->getIntName() : "NULLL"); + qDebug() << "SIGCERT" << (sigcert ? sigcert->getIntName() : "NULL"); dlg->setCert(); dlg->defineRequest(req); dlg->defineSigner(sigcert, true); diff --git a/lib/entropy.cpp b/lib/entropy.cpp index 53be5db8..981ce0c0 100644 --- a/lib/entropy.cpp +++ b/lib/entropy.cpp @@ -35,7 +35,7 @@ * 256bit entropy. Same is true for "/dev/hwrng" * * 2) Before any key or parameter generation a "reseeding" - * is done. Some say reseeding is not neccessary, but + * is done. Some say reseeding is not necessary, but * all say it does not harm. * * Entropy by Mouse and keyboard events diff --git a/lib/main.cpp b/lib/main.cpp index ee0955ad..4c6a5d0a 100644 --- a/lib/main.cpp +++ b/lib/main.cpp @@ -57,7 +57,7 @@ static void segv_handler_gui(int) int uiwriter(UI *, UI_STRING *uis) { - qWarning() << "ui-writer callled:" << UI_get0_action_string(uis) + qWarning() << "ui-writer called:" << UI_get0_action_string(uis) << UI_get0_output_string(uis); return 1; } diff --git a/lib/pki_base.cpp b/lib/pki_base.cpp index 6b007331..219fc70f 100644 --- a/lib/pki_base.cpp +++ b/lib/pki_base.cpp @@ -397,7 +397,7 @@ QString pki_base::getTypeString() const { QString t; switch (pkiType) { - case asym_key: t = "Asymetric Key"; break; + case asym_key: t = "Asymmetric Key"; break; case x509_req: t = "PKCS#10 Certificate request"; break; case x509: t = "x.509 Certificate"; break; case revocation: t = "Certificate revocation list"; break; @@ -413,7 +413,7 @@ void pki_base::print(BioByteArray &bba, enum print_opt opt) const static const QStringList order = { "Type", "Descriptor", "Subject", "Issuer", "Serial", "Not Before", "Not After", "Verify Ok", - "Unstructured Name", "Challange Password", + "Unstructured Name", "Challenge Password", "Last Update", "Next Update", "CA", "Self signed", "Key", "Signature", "Extensions", "Comment", "Algorithm", "Friendly Name" diff --git a/lib/pki_evp.cpp b/lib/pki_evp.cpp index 83955cfe..2f0b3ee4 100644 --- a/lib/pki_evp.cpp +++ b/lib/pki_evp.cpp @@ -358,7 +358,7 @@ EVP_PKEY *pki_evp::load_ssh_ed25519_privatekey(const QByteArray &ba, if (d[0] || d[1] || d[2] || d[3] != 1) return NULL; content.remove(0, 4); - // Handle first occurance of the public key + // Handle first occurrence of the public key pub = ssh_key_next_chunk(&content); ssh_key_check_chunk(&pub, "ssh-ed25519"); pub = ssh_key_next_chunk(&pub); @@ -371,7 +371,7 @@ EVP_PKEY *pki_evp::load_ssh_ed25519_privatekey(const QByteArray &ba, priv.remove(0, 8); ssh_key_check_chunk(&priv, "ssh-ed25519"); - // The first pubkey must match the second occurance + // The first pubkey must match the second occurrence // in front of the private one if (pub != ssh_key_next_chunk(&priv)) return NULL; diff --git a/lib/pki_x509req.cpp b/lib/pki_x509req.cpp index 4077b2de..e51ed341 100644 --- a/lib/pki_x509req.cpp +++ b/lib/pki_x509req.cpp @@ -338,7 +338,7 @@ void pki_x509req::collect_properties(QMap &prp) const s = getAttribute(NID_pkcs9_challengePassword); if (!s.isEmpty()) - prp["Challange Password"] = s; + prp["Challenge Password"] = s; pki_x509super::collect_properties(prp); prp["Verify Ok"] = verify() ? "Yes" : "No"; diff --git a/release/git.release b/release/git.release index c96a2912..9d6037c4 100755 --- a/release/git.release +++ b/release/git.release @@ -11,7 +11,7 @@ test -z "$2" || commit="$2" if test -z "$TVERSION"; then echo "usage: $0 [commit]" - echo " if commit is ommitted, 'HEAD' is used" + echo " if commit is omitted, 'HEAD' is used" exit 1 fi diff --git a/release/git.release.something b/release/git.release.something index 50dacc75..9783dc88 100755 --- a/release/git.release.something +++ b/release/git.release.something @@ -10,7 +10,7 @@ test -z "$2" || commit="$2" if test -z "$TVERSION"; then echo "usage: $0 [commit]" - echo " if commit is ommitted, 'master' is used" + echo " if commit is omitted, 'master' is used" exit 1 fi diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp index acaff656..4800a412 100644 --- a/widgets/MainWindow.cpp +++ b/widgets/MainWindow.cpp @@ -800,15 +800,15 @@ void MainWindow::keyPressEvent(QKeyEvent *e) QMainWindow::keyPressEvent(e); return; } - int siz = XcaApplication::tableFont.pointSize(); + int size = XcaApplication::tableFont.pointSize(); switch (e->key()) { case Qt::Key_Plus: - XcaApplication::tableFont.setPointSize(siz +1); + XcaApplication::tableFont.setPointSize(size +1); break; case Qt::Key_Minus: - if (siz > 4) { - XcaApplication::tableFont.setPointSize(siz -1); + if (size > 4) { + XcaApplication::tableFont.setPointSize(size -1); } break; case Qt::Key_V: diff --git a/widgets/NewX509.cpp b/widgets/NewX509.cpp index 964b0fc5..36bd6529 100644 --- a/widgets/NewX509.cpp +++ b/widgets/NewX509.cpp @@ -161,7 +161,7 @@ NewX509::NewX509(QWidget *w) : XcaDetail(w) nsImg->setPixmap(QPixmap(":nsImg")); - // are there any useable private keys ? + // are there any usable private keys ? newKeyDone(NULL); // any PKCS#10 requests to be used ? diff --git a/widgets/SearchPkcs11.cpp b/widgets/SearchPkcs11.cpp index 9d2281a4..3957cc89 100644 --- a/widgets/SearchPkcs11.cpp +++ b/widgets/SearchPkcs11.cpp @@ -152,14 +152,14 @@ void searchThread::cancelSearch() bool searchThread::checkLib(QString file) { - qint64 siz; + qint64 size; int r = -1; QFile qf(file); - siz = qf.size(); + size = qf.size(); if (qf.open(QIODevice::ReadOnly)) { - uchar *p = qf.map(0, siz); - r = QByteArray::fromRawData((char*)p, siz) + uchar *p = qf.map(0, size); + r = QByteArray::fromRawData((char*)p, size) .indexOf("C_GetFunctionList"); qf.unmap(p); qf.close(); diff --git a/widgets/XcaApplication.cpp b/widgets/XcaApplication.cpp index 96a5447d..a313a1bc 100644 --- a/widgets/XcaApplication.cpp +++ b/widgets/XcaApplication.cpp @@ -105,7 +105,7 @@ void XcaApplication::setupLanguage(const QLocale &lang) for (const QString &dir : dirs) { qDebug() << "Search QT translations for:" << lang << "in" << lang; if (qtTr->load(lang, "qtbase", dir)) { - qDebug() << "Fount QT translations for:" << lang << "in" << lang; + qDebug() << "Found QT translations for:" << lang << "in" << lang; break; } }