From a602e8430a83daca7dfb477573ac8d0b61c75e57 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Mon, 10 Jun 2024 20:17:53 +0300 Subject: [PATCH] Heimdal: spelling fixes (underun prefered relase encyption confunder) Gbp-Pq: Name heimdal-spelling.patch --- third_party/heimdal/lib/asn1/asn1_err.et | 2 +- third_party/heimdal/lib/asn1/asn1_print.c | 2 +- third_party/heimdal/lib/base/heimbase.c | 2 +- .../heimdal/lib/gssapi/spnego/accept_sec_context.c | 2 +- third_party/heimdal/lib/hx509/cert.c | 2 +- third_party/heimdal/lib/hx509/hx509_err.et | 4 ++-- third_party/heimdal/lib/krb5/crypto.c | 8 ++++---- third_party/heimdal/lib/sqlite/sqlite3.c | 2 +- third_party/heimdal/po/heim_com_err569856/de.po | 2 +- .../heimdal/po/heim_com_err569856/heim_com_err569856.pot | 2 +- third_party/heimdal/po/heimdal_krb5/de.po | 3 +-- third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot | 2 +- third_party/heimdal/po/heimdal_krb5/sv_SE.po | 2 +- 13 files changed, 17 insertions(+), 18 deletions(-) diff --git a/third_party/heimdal/lib/asn1/asn1_err.et b/third_party/heimdal/lib/asn1/asn1_err.et index ac7a9eba..dc08a86c 100644 --- a/third_party/heimdal/lib/asn1/asn1_err.et +++ b/third_party/heimdal/lib/asn1/asn1_err.et @@ -23,7 +23,7 @@ error_code MIN_CONSTRAINT, "ASN.1 too few elements" error_code MAX_CONSTRAINT, "ASN.1 too many elements" error_code EXACT_CONSTRAINT, "ASN.1 wrong number of elements" error_code INDEF_OVERRUN, "ASN.1 BER indefinte encoding overrun" -error_code INDEF_UNDERRUN, "ASN.1 BER indefinte encoding underun" +error_code INDEF_UNDERRUN, "ASN.1 BER indefinte encoding underrun" error_code GOT_BER, "ASN.1 got BER encoded when expected DER" error_code INDEF_EXTRA_DATA, "ASN.1 EoC tag contained data" end diff --git a/third_party/heimdal/lib/asn1/asn1_print.c b/third_party/heimdal/lib/asn1/asn1_print.c index 9ef6ffd2..9b598b78 100644 --- a/third_party/heimdal/lib/asn1/asn1_print.c +++ b/third_party/heimdal/lib/asn1/asn1_print.c @@ -566,7 +566,7 @@ dotype(unsigned char *buf, size_t len, char **argv, size_t *size) "BER indefinte encoding overun", typename); case ASN1_INDEF_UNDERRUN: errx(1, "Could not decode and print data as type %s: " - "BER indefinte encoding underun", typename); + "BER indefinte encoding underrun", typename); case ASN1_GOT_BER: errx(1, "Could not decode and print data as type %s: " "BER encoding when DER expected", typename); diff --git a/third_party/heimdal/lib/base/heimbase.c b/third_party/heimdal/lib/base/heimbase.c index 4e9ea1b4..05add641 100644 --- a/third_party/heimdal/lib/base/heimbase.c +++ b/third_party/heimdal/lib/base/heimbase.c @@ -701,7 +701,7 @@ heim_auto_release(heim_object_t ptr) } if (tls == NULL || (ar = tls->current) == NULL) - heim_abort("no auto relase pool in place, would leak"); + heim_abort("no auto release pool in place, would leak"); HEIMDAL_MUTEX_lock(&ar->pool_mutex); HEIM_TAILQ_INSERT_HEAD(&ar->pool, p, autorel); diff --git a/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c b/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c index c4ac7455..7a211900 100644 --- a/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c +++ b/third_party/heimdal/lib/gssapi/spnego/accept_sec_context.c @@ -747,7 +747,7 @@ acceptor_start HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex); return gss_mg_set_error_string(GSS_C_NO_OID, GSS_S_NO_CONTEXT, *minor_status, - "SPNEGO acceptor didn't find a prefered mechanism"); + "SPNEGO acceptor didn't find a preferred mechanism"); } /* diff --git a/third_party/heimdal/lib/hx509/cert.c b/third_party/heimdal/lib/hx509/cert.c index 4fcb4ba8..9c7997dc 100644 --- a/third_party/heimdal/lib/hx509/cert.c +++ b/third_party/heimdal/lib/hx509/cert.c @@ -1506,7 +1506,7 @@ _hx509_calculate_path(hx509_context context, if (path->len > max_depth) { hx509_cert_free(current); hx509_set_error_string(context, 0, HX509_PATH_TOO_LONG, - "Path too long while bulding " + "Path too long while building " "certificate chain"); return HX509_PATH_TOO_LONG; } diff --git a/third_party/heimdal/lib/hx509/hx509_err.et b/third_party/heimdal/lib/hx509/hx509_err.et index 9b816754..70c747a9 100644 --- a/third_party/heimdal/lib/hx509/hx509_err.et +++ b/third_party/heimdal/lib/hx509/hx509_err.et @@ -62,8 +62,8 @@ error_code SIG_INVALID_FORMAT, "Invalid format on signature" error_code OID_MISMATCH, "Mismatch between oids" error_code NO_PROMPTER, "No prompter function defined" error_code SIGNATURE_WITHOUT_SIGNER, "Signature requires signer, but none available" -error_code RSA_PUBLIC_ENCRYPT, "RSA public encyption failed" -error_code RSA_PRIVATE_ENCRYPT, "RSA private encyption failed" +error_code RSA_PUBLIC_ENCRYPT, "RSA public encryption failed" +error_code RSA_PRIVATE_ENCRYPT, "RSA private encryption failed" error_code RSA_PUBLIC_DECRYPT, "RSA public decryption failed" error_code RSA_PRIVATE_DECRYPT, "RSA private decryption failed" error_code ALGORITHM_BEST_BEFORE, "Algorithm has passed its best before date" diff --git a/third_party/heimdal/lib/krb5/crypto.c b/third_party/heimdal/lib/krb5/crypto.c index b52f0846..af86f7c4 100644 --- a/third_party/heimdal/lib/krb5/crypto.c +++ b/third_party/heimdal/lib/krb5/crypto.c @@ -1226,7 +1226,7 @@ decrypt_internal_derived(krb5_context context, if (len < checksum_sz + et->confoundersize) { krb5_set_error_message(context, KRB5_BAD_MSIZE, N_("Encrypted data shorter then " - "checksum + confunder", "")); + "checksum + confounder", "")); return KRB5_BAD_MSIZE; } @@ -1301,7 +1301,7 @@ decrypt_internal_enc_then_cksum(krb5_context context, if (len < checksum_sz + et->confoundersize) { krb5_set_error_message(context, KRB5_BAD_MSIZE, N_("Encrypted data shorter then " - "checksum + confunder", "")); + "checksum + confounder", "")); return KRB5_BAD_MSIZE; } @@ -1383,7 +1383,7 @@ decrypt_internal(krb5_context context, if (len < checksum_sz + et->confoundersize) { krb5_set_error_message(context, KRB5_BAD_MSIZE, N_("Encrypted data shorter then " - "checksum + confunder", "")); + "checksum + confounder", "")); return KRB5_BAD_MSIZE; } @@ -1445,7 +1445,7 @@ decrypt_internal_special(krb5_context context, if (len < cksum_sz + et->confoundersize) { krb5_set_error_message(context, KRB5_BAD_MSIZE, N_("Encrypted data shorter then " - "checksum + confunder", "")); + "checksum + confounder", "")); return KRB5_BAD_MSIZE; } diff --git a/third_party/heimdal/lib/sqlite/sqlite3.c b/third_party/heimdal/lib/sqlite/sqlite3.c index de55858c..7aaed45e 100644 --- a/third_party/heimdal/lib/sqlite/sqlite3.c +++ b/third_party/heimdal/lib/sqlite/sqlite3.c @@ -95906,7 +95906,7 @@ static int vdbeSorterFlushPMA(VdbeSorter *pSorter){ ** the background thread from a sub-tasks previous turn is still running, ** skip it. If the first (pSorter->nTask-1) sub-tasks are all still busy, ** fall back to using the final sub-task. The first (pSorter->nTask-1) - ** sub-tasks are prefered as they use background threads - the final + ** sub-tasks are preferred as they use background threads - the final ** sub-task uses the main thread. */ for(i=0; iiPrev + i + 1) % nWorker; diff --git a/third_party/heimdal/po/heim_com_err569856/de.po b/third_party/heimdal/po/heim_com_err569856/de.po index 5e6ace5d..ba2dbf6e 100644 --- a/third_party/heimdal/po/heim_com_err569856/de.po +++ b/third_party/heimdal/po/heim_com_err569856/de.po @@ -273,7 +273,7 @@ msgstr "Signatur erfordert Unterzeichner, aber keiner verfügbar" #. 073 #. 074 #: ../lib/hx509/hx509_err.c:84 ../lib/hx509/hx509_err.c:85 -msgid "RSA public encyption failed" +msgid "RSA public encryption failed" msgstr "RSA-Verschlüsselung mit öffentlichem Schlüssel fehlgeschlagen" #. 075 diff --git a/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot b/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot index 2913f6bc..2305f21a 100644 --- a/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot +++ b/third_party/heimdal/po/heim_com_err569856/heim_com_err569856.pot @@ -267,7 +267,7 @@ msgstr "" #. 073 #. 074 #: ../lib/hx509/hx509_err.c:84 ../lib/hx509/hx509_err.c:85 -msgid "RSA public encyption failed" +msgid "RSA public encryption failed" msgstr "" #. 075 diff --git a/third_party/heimdal/po/heimdal_krb5/de.po b/third_party/heimdal/po/heimdal_krb5/de.po index 037cc46c..26efb293 100644 --- a/third_party/heimdal/po/heimdal_krb5/de.po +++ b/third_party/heimdal/po/heimdal_krb5/de.po @@ -325,9 +325,8 @@ msgstr "Verschlüsselungstyp %s ist deaktiviert." msgid "checksum type %s is disabled" msgstr "Prüfsummentyp %s ist deaktiviert." -# FIXME: s/confunder/confounder/ #: lib/krb5/crypto.c:2958 -msgid "Encrypted data shorter then checksum + confunder" +msgid "Encrypted data shorter then checksum + confounder" msgstr "verschlüsselte Daten kürzer als Prüfsumme + Störfaktor" #: lib/krb5/crypto.c:3585 diff --git a/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot b/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot index 9dbaaaf7..ac3effae 100644 --- a/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot +++ b/third_party/heimdal/po/heimdal_krb5/heimdal_krb5.pot @@ -549,7 +549,7 @@ msgid "checksum type %s is disabled" msgstr "" #: lib/krb5/crypto.c:2958 -msgid "Encrypted data shorter then checksum + confunder" +msgid "Encrypted data shorter then checksum + confounder" msgstr "" #: lib/krb5/crypto.c:3585 diff --git a/third_party/heimdal/po/heimdal_krb5/sv_SE.po b/third_party/heimdal/po/heimdal_krb5/sv_SE.po index ffd1ca7c..8d5caa1a 100644 --- a/third_party/heimdal/po/heimdal_krb5/sv_SE.po +++ b/third_party/heimdal/po/heimdal_krb5/sv_SE.po @@ -540,7 +540,7 @@ msgid "checksum type %s is disabled" msgstr "" #: lib/krb5/crypto.c:2979 -msgid "Encrypted data shorter then checksum + confunder" +msgid "Encrypted data shorter then checksum + confounder" msgstr "" #: lib/krb5/crypto.c:3589 -- 2.30.2