fix spelling issues

32 files changed, 54 insertions, 55 deletions

diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
index 01cd6ac2f..57853e99e 100644
--- a/contrib/Makefile.am.in
+++ b/contrib/Makefile.am.in
@@ -48,7 +48,6 @@ CLEANFILES = \
 EXTRA_DIST = \
   locale/de/LC_MESSAGES/exchange-tos-v0.po \
   taler-bank-manage-testing \
-  taler-nexus-prepare \
   taler-terms-generator.in \
   taler-auditor-dbconfig \
   taler-exchange-dbconfig \
diff --git a/contrib/ci/jobs/0-codespell/job.sh b/contrib/ci/jobs/0-codespell/job.sh
index 58bd07b5a..b9c5c9963 100755
--- a/contrib/ci/jobs/0-codespell/job.sh
+++ b/contrib/ci/jobs/0-codespell/job.sh
@@ -3,4 +3,4 @@ set -exuo pipefail
 
 job_dir=$(dirname "${BASH_SOURCE[0]}")
 
-codespell -I "${job_dir}"/dictionary.txt -S "*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/templating/test?/**,**/auditor/*.sql,**/templating/mustach**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.doc,*.docx,*.xcf,*.xlsx,*.ecc,*.ttf,*.woff2,*.eot,*.ttf,*.eot,*.mp4,*.pptx,*.epgz,*.min.js,**/*.map,**/fonts/**,*.pack.js,*.po,*.bbl,*/afl-tests/*,*/.git/**,*.pdf,*.epub,**/signing-key.asc,**/pnpm-lock.yaml,**/*.svg,**/*.cls,**/rfc.bib,**/*.bst,*/cbdc-es.tex,*/cbdc-it.tex,**/ExchangeSelection/example.ts,*/testcurl/test_tricky.c,*/i18n/strings.ts,*/src/anastasis-data.ts,**/doc/flows/main.de.tex"
+codespell -I "${job_dir}"/dictionary.txt -S "*.bib,*.bst,*.cls,*.json,*.png,*.svg,*.wav,*.gz,*/templating/test?/**,**/auditor/*.sql,**/templating/mustach**,*.fees,*key,*.tag,*.info,*.latexmkrc,*.ecc,*.jpg,*.zkey,*.sqlite,*/contrib/hellos/**,*/vpn/tests/**,**/valgrind.h,*.priv,*.file,*.tgz,*.woff,*.gif,*.odt,*.fee,*.deflate,*.dat,*.jpeg,*.eps,*.odg,*/m4/ax_lib_postgresql.m4,*/m4/libgcrypt.m4,*.rpath,config.status,ABOUT-NLS,*/doc/texinfo.tex,*.PNG,*.??.json,*.docx,*.ods,*.doc,*.docx,*.xcf,*.xlsx,*.ecc,*.ttf,*.woff2,*.eot,*.ttf,*.eot,*.mp4,*.pptx,*.epgz,*.min.js,**/*.map,**/fonts/**,*.pack.js,*.po,*.bbl,*/afl-tests/*,*/.git/**,*.pdf,*.epub,**/signing-key.asc,**/pnpm-lock.yaml,**/*.svg,**/*.cls,**/rfc.bib,**/*.bst,*/cbdc-es.tex,*/cbdc-it.tex,**/ExchangeSelection/example.ts,*/testcurl/test_tricky.c,*/i18n/strings.ts,*/src/anastasis-data.ts,**/doc/flows/main.de.tex"
diff --git a/contrib/wallet-core b/contrib/wallet-core
-Subproject 6eca153b329953b703d0517dbd65001715431c6
+Subproject 53472cb936c69a6830c48d4c8d79d43cb19e37e
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject 09a33a50d9b3b400f8a515082c888918cbf4e1b
+Subproject 5e47a72e8a2b5086dfdae4078f695155f5ed7af
diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c
index 248e14e1f..bee7ec0f6 100644
--- a/src/auditor/report-lib.c
+++ b/src/auditor/report-lib.c
@@ -260,7 +260,7 @@ TALER_ARL_get_denomination_info (
  *
  * @param analysis analysis to run
  * @param analysis_cls closure for @a analysis
- * @return #GNUNET_OK if @a analysis succeessfully committed,
+ * @return #GNUNET_OK if @a analysis successfully committed,
  *         #GNUNET_NO if we had an error on commit (retry may help)
  *         #GNUNET_SYSERR on hard errors
  */
diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c
index fe95dfe3e..8b2808401 100644
--- a/src/auditor/taler-helper-auditor-aggregation.c
+++ b/src/auditor/taler-helper-auditor-aggregation.c
@@ -44,7 +44,7 @@ static struct TALER_AUDITORDB_ProgressPointAggregation ppa;
 static struct TALER_AUDITORDB_ProgressPointAggregation ppa_start;
 
 /**
- * Array of reports about row inconsitencies.
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
index 41c4f5205..23233dc7c 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -126,7 +126,7 @@ static json_t *report_bad_sig_losses;
  * Array of refresh transactions where the /refresh/reveal has not yet
  * happened (and may of course never happen).
  */
-static json_t *report_refreshs_hanging;
+static json_t *report_refreshes_hanging;
 
 /**
  * Total amount lost by operations for which signatures were invalid.
@@ -1340,7 +1340,7 @@ refresh_session_cb (void *cls,
       /* This can legitimately happen if reveal was not yet called or only
          with invalid data, even if the exchange is correctly operating. We
          still report it. */
-      TALER_ARL_report (report_refreshs_hanging,
+      TALER_ARL_report (report_refreshes_hanging,
                         GNUNET_JSON_PACK (
                           GNUNET_JSON_pack_uint64 ("row",
                                                    rowid),
@@ -2554,7 +2554,7 @@ analyze_coins (void *cls)
   if (0 > cc.qs)
     return cc.qs;
 
-  /* process refreshs */
+  /* process refreshes */
   if (0 >
       (qs = TALER_ARL_edb->select_refreshes_above_serial_id (
          TALER_ARL_edb->cls,
@@ -2739,7 +2739,7 @@ run (void *cls,
   GNUNET_assert (NULL !=
                  (report_bad_sig_losses = json_array ()));
   GNUNET_assert (NULL !=
-                 (report_refreshs_hanging = json_array ()));
+                 (report_refreshes_hanging = json_array ()));
   if (GNUNET_OK !=
       TALER_ARL_setup_sessions_and_run (&analyze_coins,
                                         NULL))
@@ -2792,7 +2792,7 @@ run (void *cls,
                                     report_bad_sig_losses),
       /* Tested in test-auditor.sh #12 */
       GNUNET_JSON_pack_array_steal ("refresh_hanging",
-                                    report_refreshs_hanging),
+                                    report_refreshes_hanging),
       /* Tested in test-auditor.sh #18 */
       GNUNET_JSON_pack_array_steal ("emergencies_by_count",
                                     report_emergencies_by_count),
diff --git a/src/auditor/taler-helper-auditor-purses.c b/src/auditor/taler-helper-auditor-purses.c
index f35020734..e728df0ee 100644
--- a/src/auditor/taler-helper-auditor-purses.c
+++ b/src/auditor/taler-helper-auditor-purses.c
@@ -54,12 +54,12 @@ static struct TALER_AUDITORDB_ProgressPointPurse ppp_start;
 static struct TALER_AUDITORDB_PurseBalance balance;
 
 /**
- * Array of reports about row inconsitencies.
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
 /**
- * Array of reports about purse balance insufficient inconsitencies.
+ * Array of reports about purse balance insufficient inconsistencies.
  */
 static json_t *report_purse_balance_insufficient_inconsistencies;
 
@@ -74,7 +74,7 @@ static struct TALER_Amount total_balance_insufficient_loss;
 static struct TALER_Amount total_delayed_decisions;
 
 /**
- * Array of reports about purses's not being closed inconsitencies.
+ * Array of reports about purses's not being closed inconsistencies.
  */
 static json_t *report_purse_not_closed_inconsistencies;
 
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
index f589ebfda..6bd550373 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -54,7 +54,7 @@ static struct TALER_AUDITORDB_ProgressPointReserve ppr;
 static struct TALER_AUDITORDB_ProgressPointReserve ppr_start;
 
 /**
- * Array of reports about row inconsitencies.
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
@@ -65,12 +65,12 @@ static json_t *report_row_inconsistencies;
 static json_t *denomination_key_validity_withdraw_inconsistencies;
 
 /**
- * Array of reports about reserve balance insufficient inconsitencies.
+ * Array of reports about reserve balance insufficient inconsistencies.
  */
 static json_t *report_reserve_balance_insufficient_inconsistencies;
 
 /**
- * Array of reports about purse balance insufficient inconsitencies.
+ * Array of reports about purse balance insufficient inconsistencies.
  */
 static json_t *report_purse_balance_insufficient_inconsistencies;
 
@@ -94,7 +94,7 @@ static struct TALER_Amount total_balance_summary_delta_plus;
 static struct TALER_Amount total_balance_summary_delta_minus;
 
 /**
- * Array of reports about reserve's not being closed inconsitencies.
+ * Array of reports about reserve's not being closed inconsistencies.
  */
 static json_t *report_reserve_not_closed_inconsistencies;
 
diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c
index 9f85722d4..de5acc48a 100644
--- a/src/auditor/taler-helper-auditor-wire.c
+++ b/src/auditor/taler-helper-auditor-wire.c
@@ -186,12 +186,12 @@ static struct TALER_AUDITORDB_WireProgressPoint pp;
 static struct TALER_AUDITORDB_WireProgressPoint start_pp;
 
 /**
- * Array of reports about row inconsitencies in wire_out table.
+ * Array of reports about row inconsistencies in wire_out table.
  */
 static json_t *report_wire_out_inconsistencies;
 
 /**
- * Array of reports about row inconsitencies in reserves_in table.
+ * Array of reports about row inconsistencies in reserves_in table.
  */
 static json_t *report_reserve_in_inconsistencies;
 
@@ -1386,7 +1386,7 @@ wire_out_cb (void *cls,
   {
     /* Wire transfer was not made (yet) at all (but would have been
        justified), so the entire amount is missing / still to be done.
-       This is moderately harmless, it might just be that the aggreator
+       This is moderately harmless, it might just be that the aggregator
        has not yet fully caught up with the transfers it should do. */
     TALER_ARL_report (
       report_wire_out_inconsistencies,
diff --git a/src/bank-lib/fakebank.h b/src/bank-lib/fakebank.h
index 6310231b9..a9d61d8b1 100644
--- a/src/bank-lib/fakebank.h
+++ b/src/bank-lib/fakebank.h
@@ -551,7 +551,7 @@ struct TALER_FAKEBANK_Handle
   /**
    * Hashmap of reserve public keys to
    * `struct Transaction` with that reserve public
-   * key. Used to prevent public-key re-use.
+   * key. Used to prevent public-key reuse.
    */
   struct GNUNET_CONTAINER_MultiPeerMap *rpubs;
 
diff --git a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c
index 10a241fa8..7fbb93352 100644
--- a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c
+++ b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c
@@ -38,7 +38,7 @@
  * @param h our fakebank handle
  * @param connection the connection
  * @param account_name name of the account
- * @param amount amont to withdraw
+ * @param amount amount to withdraw
  * @return MHD result code
  */
 static MHD_RESULT
diff --git a/src/exchange/taler-exchange-httpd_age-withdraw.c b/src/exchange/taler-exchange-httpd_age-withdraw.c
index 1759bc552..939e0f76d 100644
--- a/src/exchange/taler-exchange-httpd_age-withdraw.c
+++ b/src/exchange/taler-exchange-httpd_age-withdraw.c
@@ -71,7 +71,7 @@ struct AgeWithdrawContext
   /**
    * #num_coins * #kappa hashes of blinded coin planchets.
    */
-  struct TALER_BlindedPlanchet (*coin_evs)[TALER_CNC_KAPPA];
+  struct TALER_BlindedPlanchet (*coin_evs) [ TALER_CNC_KAPPA];
 
   /**
    * #num_coins hashes of the denominations from which the coins are withdrawn.
@@ -310,7 +310,7 @@ EXIT:
  * @param ksh The handle to the current state of (denomination) keys in the exchange
  * @param denom_h Hash of the denomination key to check
  * @param[out] pdk On success, will contain the denomination key details
- * @param[out] result On failure, an MHD-response will be qeued and result will be set to accordingly
+ * @param[out] result On failure, an MHD-response will be queued and result will be set to accordingly
  * @return true on success (denomination valid), false otherwise
  */
 static bool
@@ -409,7 +409,7 @@ are_denominations_valid (
   struct MHD_Connection *connection,
   uint32_t len,
   const struct TALER_DenominationHashP *denom_hs,
-  const struct TALER_BlindedPlanchet (*coin_evs)[TALER_CNC_KAPPA],
+  const struct TALER_BlindedPlanchet (*coin_evs) [ TALER_CNC_KAPPA],
   uint64_t **denom_serials,
   struct TALER_Amount *amount_with_fee,
   MHD_RESULT *result)
@@ -450,7 +450,7 @@ are_denominations_valid (
       return GNUNET_SYSERR;
 
     /* Ensure the ciphers from the planchets match the denominations' */
-    for (uint8_t k=0; k < TALER_CNC_KAPPA; k++)
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
     {
       if (dk->denom_pub.bsign_pub_key->cipher !=
           coin_evs[i][k].blinded_message->cipher)
diff --git a/src/exchange/taler-exchange-httpd_batch-withdraw.c b/src/exchange/taler-exchange-httpd_batch-withdraw.c
index 19a9cacf1..e296f31f8 100644
--- a/src/exchange/taler-exchange-httpd_batch-withdraw.c
+++ b/src/exchange/taler-exchange-httpd_batch-withdraw.c
@@ -75,7 +75,7 @@ struct BatchWithdrawContext
 {
 
   /**
-   * Public key of the reserv.
+   * Public key of the reserve.
    */
   const struct TALER_ReservePublicKeyP *reserve_pub;
 
diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c
index f8aea95c5..b31078f00 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -288,7 +288,7 @@ static MHD_RESULT
 check_melt_valid (struct MHD_Connection *connection,
                   struct MeltContext *rmc)
 {
-  /* Baseline: check if deposits/refreshs are generally
+  /* Baseline: check if deposits/refreshes are generally
      simply still allowed for this denomination */
   struct TEH_DenominationKey *dk;
   MHD_RESULT mret;
diff --git a/src/exchangedb/pg_select_aggregations_above_serial.h b/src/exchangedb/pg_select_aggregations_above_serial.h
index 3950d11fb..2883b19f2 100644
--- a/src/exchangedb/pg_select_aggregations_above_serial.h
+++ b/src/exchangedb/pg_select_aggregations_above_serial.h
@@ -31,7 +31,7 @@
  * above a given @a min_tracking_serial_id.
  *
  * @param cls closure
- * @param min_tracking_serial_id only return entries stricly above this row (and in order)
+ * @param min_tracking_serial_id only return entries strictly above this row (and in order)
  * @param cb function to call on all such aggregations
  * @param cb_cls closure for @a cb
  * @return transaction status code
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index dc431af53..eec8a9020 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -1717,7 +1717,7 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info,
  * Compute the hash of a blinded coin.
  *
  * @param blinded_planchet blinded planchet
- * @param denom_hash hash of the denomination publick key
+ * @param denom_hash hash of the denomination public key
  * @param[out] bch where to write the hash
  * @return #GNUNET_OK when successful, #GNUNET_SYSERR if an internal error occurred
  */
@@ -4682,7 +4682,7 @@ TALER_exchange_online_age_withdraw_confirmation_sign (
 
 
 /**
- * Verfiy an exchange age-withdraw confirmation
+ * Verify an exchange age-withdraw confirmation
  *
  * @param h_commitment Commitment over all n*kappa coin candidates from the original request to age-withdraw
  * @param noreveal_index The index returned by the exchange
@@ -5727,7 +5727,7 @@ TALER_age_commitment_derive (
  *
  * @param comm_proof The age commitment to be used for attestation.  For successful attestation, it must contain the private key for the corresponding age group.
  * @param age Age (not age group) for which the an attestation should be done
- * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
+ * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
  * @return #GNUNET_OK on success, #GNUNET_NO when no attestation can be made for that age with the given commitment, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
@@ -5742,7 +5742,7 @@ TALER_age_commitment_attest (
  *
  * @param commitment The age commitment that went into the attestation.  Only the public keys are needed.
  * @param age Age (not age group) for which the an attestation should be done
- * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
+ * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
  * @return #GNUNET_OK when the attestation was successful, #GNUNET_NO no attestation couldn't be verified, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 503074599..b2e513341 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -815,7 +815,7 @@ TALER_EXCHANGE_keys_incref (struct TALER_EXCHANGE_Keys *keys);
 
 
 /**
- * Deccrement reference counter for @a keys.
+ * Decrement reference counter for @a keys.
  * Frees @a keys if reference counter becomes zero.
  *
  * @param[in,out] keys object to decrement reference counter for
@@ -1892,7 +1892,7 @@ TALER_EXCHANGE_coins_history (
 /**
  * Cancel #TALER_EXCHANGE_coins_history() operation.
  *
- * @param[in] rsh operation to chancel
+ * @param[in] rsh operation to cancel
  */
 void
 TALER_EXCHANGE_coins_history_cancel (
@@ -2992,7 +2992,7 @@ typedef void
  * @param curl_ctx The curl context
  * @param exchange_url The base url of the exchange
  * @param keys The denomination keys from the exchange
- * @param reserve_priv The pivate key to the reserve
+ * @param reserve_priv The private key to the reserve
  * @param num_coins The number of elements in @e coin_inputs
  * @param coin_inputs The input for the coins to withdraw
  * @param max_age The maximum age we commit to.
diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h
index 17b01b0ad..d93cf9d6c 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_exchangedb_lib.h
@@ -69,13 +69,13 @@ struct TALER_EXCHANGEDB_AccountInfo
   const char *method;
 
   /**
-   * true if this account is enabed to be debited
+   * true if this account is enabled to be debited
    * by the taler-exchange-aggregator.
    */
   bool debit_enabled;
 
   /**
-   * true if this account is enabed to be credited by wallets
+   * true if this account is enabled to be credited by wallets
    * and needs to be watched by the taler-exchange-wirewatch.
    * Also, the account will only be included in /wire if credit
    * is enabled.
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index c68ebb539..6da278637 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -5530,7 +5530,7 @@ struct TALER_EXCHANGEDB_Plugin
    * above a given @a min_batch_deposit_serial_id.
    *
    * @param cls closure
-   * @param min_batch_deposit_serial_id only return entries stricly above this row (and in order)
+   * @param min_batch_deposit_serial_id only return entries strictly above this row (and in order)
    * @param cb function to call on all such deposits
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -5548,7 +5548,7 @@ struct TALER_EXCHANGEDB_Plugin
    * above a given @a min_tracking_serial_id.
    *
    * @param cls closure
-   * @param min_tracking_serial_id only return entries stricly above this row (and in order)
+   * @param min_tracking_serial_id only return entries strictly above this row (and in order)
    * @param cb function to call on all such aggregations
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -7088,7 +7088,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param new_status AML decision status
    * @param decision_time when was the decision made
    * @param justification human-readable text justifying the decision
-   * @param kyc_requirements specific KYC requiremnts being imposed
+   * @param kyc_requirements specific KYC requirements being imposed
    * @param requirements_row row in the KYC table for this process, 0 for none
    * @param decider_pub public key of the staff member
    * @param decider_sig signature of the staff member
diff --git a/src/include/taler_kyclogic_lib.h b/src/include/taler_kyclogic_lib.h
index dfa4c58ac..4d0c18fa4 100644
--- a/src/include/taler_kyclogic_lib.h
+++ b/src/include/taler_kyclogic_lib.h
@@ -259,7 +259,7 @@ TALER_KYCLOGIC_check_satisfied (char **requirements,
  * Iterate over all thresholds that are applicable
  * to a particular type of @a event
  *
- * @param event tresholds to look up
+ * @param event thresholds to look up
  * @param it function to call on each
  * @param it_cls closure for @a it
  */
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h
index 60c5b209d..db6db05e8 100644
--- a/src/include/taler_mhd_lib.h
+++ b/src/include/taler_mhd_lib.h
@@ -481,7 +481,7 @@ TALER_MHD_parse_request_arg_timeout (struct MHD_Connection *connection,
  *
  * @param connection the MHD connection
  * @param name name of the query parameter
- * @param[out] off set to the offet, unchanged if the
+ * @param[out] off set to the offset, unchanged if the
  *             option was not given
  * @return #GNUNET_OK on success,
  *         #GNUNET_NO if an error was returned on @a connection (caller should return #MHD_YES) and
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index a0a25832b..90f6ade88 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1151,7 +1151,7 @@ TALER_TESTING_cmd_age_withdraw_reveal (
  * @param amount how much we withdraw.
  * @param age if > 0, age restriction applies.
  * @param coin_ref reference to (withdraw/reveal) command of a coin
- *        from which we should re-use the private key
+ *        from which we should reuse the private key
  * @param expected_response_code which HTTP response code
  *        we expect from the exchange.
  * @return the withdraw command to be executed by the interpreter.
@@ -1919,7 +1919,7 @@ struct TALER_TESTING_Timer
   struct GNUNET_TIME_Relative total_duration;
 
   /**
-   * Total time spend waiting for the *successful* exeuction
+   * Total time spend waiting for the *successful* execution
    * in all commands of this type.
    */
   struct GNUNET_TIME_Relative success_latency;
diff --git a/src/lib/exchange_api_age_withdraw.c b/src/lib/exchange_api_age_withdraw.c
index efa605aea..e319332d1 100644
--- a/src/lib/exchange_api_age_withdraw.c
+++ b/src/lib/exchange_api_age_withdraw.c
@@ -161,7 +161,7 @@ struct TALER_EXCHANGE_AgeWithdrawBlindedHandle
   struct TALER_EXCHANGE_Keys *keys;
 
   /**
-   * The age mask, extacted from the denominations.
+   * The age mask, extracted from the denominations.
    * MUST be the same for all denominations
    *
    */
@@ -263,7 +263,7 @@ struct TALER_EXCHANGE_AgeWithdrawHandle
   struct TALER_EXCHANGE_Keys *keys;
 
   /**
-   * The age mask, extacted from the denominations.
+   * The age mask, extracted from the denominations.
    * MUST be the same for all denominations
    *
    */
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index ab3c387df..1d44ed34f 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -59,7 +59,7 @@
 #define EXCHANGE_SERIALIZATION_FORMAT_VERSION 0
 
 /**
- * How far off do we allow key liftimes to be?
+ * How far off do we allow key lifetimes to be?
  */
 #define LIFETIME_TOLERANCE GNUNET_TIME_UNIT_HOURS
 
diff --git a/src/lib/exchange_api_purse_create_with_deposit.c b/src/lib/exchange_api_purse_create_with_deposit.c
index 215b7847e..fc2499338 100644
--- a/src/lib/exchange_api_purse_create_with_deposit.c
+++ b/src/lib/exchange_api_purse_create_with_deposit.c
@@ -114,7 +114,7 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle
   struct TALER_Amount purse_value_after_fees;
 
   /**
-   * Our encryped contract (if we had any).
+   * Our encrypted contract (if we had any).
    */
   struct TALER_EncryptedContract econtract;
 
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index 4ae47aff2..caeec1e76 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -55,7 +55,7 @@ static struct TALER_TESTING_Credentials cred;
 
 /**
  * Some tests behave differently when using CS as we cannot
- * re-use the coin private key for different denominations
+ * reuse the coin private key for different denominations
  * due to the derivation of it with the /csr values. Hence
  * some tests behave differently in CS mode, hence this
  * flag.
diff --git a/src/testing/test_exchange_api_age_restriction.c b/src/testing/test_exchange_api_age_restriction.c
index 90d35ebc3..5ba24a00c 100644
--- a/src/testing/test_exchange_api_age_restriction.c
+++ b/src/testing/test_exchange_api_age_restriction.c
@@ -47,7 +47,7 @@ static struct TALER_TESTING_Credentials cred;
 
 /**
  * Some tests behave differently when using CS as we cannot
- * re-use the coin private key for different denominations
+ * reuse the coin private key for different denominations
  * due to the derivation of it with the /csr values. Hence
  * some tests behave differently in CS mode, hence this
  * flag.
diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c
index 1c075fc1b..0c4fb48ec 100644
--- a/src/testing/test_exchange_p2p.c
+++ b/src/testing/test_exchange_p2p.c
@@ -48,7 +48,7 @@ struct TALER_TESTING_Credentials cred;
 
 /**
  * Some tests behave differently when using CS as we cannot
- * re-use the coin private key for different denominations
+ * reuse the coin private key for different denominations
  * due to the derivation of it with the /csr values. Hence
  * some tests behave differently in CS mode, hence this
  * flag.
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c
index e4c054c5f..75311e7dc 100644
--- a/src/testing/testing_api_cmd_batch_withdraw.c
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -85,7 +85,7 @@ struct CoinState
 
   /**
    * If age > 0, put here the corresponding age commitment with its proof and
-   * its hash, respectivelly.
+   * its hash, respectively.
    */
   struct TALER_AgeCommitmentProof age_commitment_proof;
   struct TALER_AgeCommitmentHash h_age_commitment;
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index 13162a34a..a98e69521 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -62,7 +62,7 @@ struct WithdrawState
 
   /**
    * Reference to a withdraw or reveal operation from which we should
-   * re-use the private coin key, or NULL for regular withdrawal.
+   * reuse the private coin key, or NULL for regular withdrawal.
    */
   const char *reuse_coin_key_ref;
 
@@ -144,7 +144,7 @@ struct WithdrawState
 
   /**
    * If age > 0, put here the corresponding age commitment with its proof and
-   * its hash, respectivelly.
+   * its hash, respectively.
    */
   struct TALER_AgeCommitmentProof age_commitment_proof;
   struct TALER_AgeCommitmentHash h_age_commitment;
diff --git a/src/util/age_restriction.c b/src/util/age_restriction.c
index f79c767a9..c2a7fc07c 100644
--- a/src/util/age_restriction.c
+++ b/src/util/age_restriction.c
@@ -681,7 +681,7 @@ TALER_age_restriction_from_secret (
 
   /* Create as many private keys as allow with max_age and derive the
    * corresponding public keys.  The rest of the needed public keys are created
-   * by scalar mulitplication with the TALER_age_commitment_base_public_key. */
+   * by scalar multiplication with the TALER_age_commitment_base_public_key. */
   for (size_t i = 0; i < num_pub; i++)
   {
     enum GNUNET_GenericReturnValue ret;