diff options
25 files changed, 75 insertions, 187 deletions
diff --git a/contrib/microhttpd.tag b/contrib/microhttpd.tag index 831e1c4e4..018723697 100644 --- a/contrib/microhttpd.tag +++ b/contrib/microhttpd.tag @@ -172,6 +172,30 @@ <anchorfile>microhttpd.h</anchorfile> <arglist></arglist> </member> + <member kind="define"> + <type>#define</type> + <name>MHD_HTTP_METHOD_GET</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> + <name>MHD_HTTP_METHOD_POST</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> + <name>MHD_HTTP_METHOD_PUT</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist></arglist> + </member> + <member kind="define"> + <type>#define</type> + <name>MHD_HTTP_METHOD_DELETE</name> + <anchorfile>microhttpd.h</anchorfile> + <arglist></arglist> + </member> <member kind="typedef"> <type>int</type> <name>MHD_AccessHandlerCallback</name> diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c index 0dea786da..97270ffbe 100644 --- a/src/auditor/report-lib.c +++ b/src/auditor/report-lib.c @@ -89,13 +89,6 @@ static struct GNUNET_SIGNAL_Context *sig_int; static struct GNUNET_SIGNAL_Context *sig_term; -/** - * Test if the audit should be aborted because the user - * pressed CTRL-C. - * - * @return false to continue the audit, true to terminate - * cleanly as soon as possible - */ bool TALER_ARL_do_abort (void) { @@ -103,12 +96,6 @@ TALER_ARL_do_abort (void) } -/** - * Add @a object to the report @a array. Fail hard if this fails. - * - * @param array report array to append @a object to - * @param object object to append, should be check that it is not NULL - */ void TALER_ARL_report (json_t *array, json_t *object) @@ -183,14 +170,6 @@ add_denomination ( } -/** - * Obtain information about a @a denom_pub. - * - * @param dh hash of the denomination public key to look up - * @param[out] issue set to detailed information about @a denom_pub, NULL if not found, must - * NOT be freed by caller - * @return transaction status code - */ enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info_by_hash ( const struct TALER_DenominationHash *dh, @@ -262,15 +241,6 @@ TALER_ARL_get_denomination_info_by_hash ( } -/** - * Obtain information about a @a denom_pub. - * - * @param denom_pub key to look up - * @param[out] issue set to detailed information about @a denom_pub, NULL if not found, must - * NOT be freed by caller - * @param[out] dh set to the hash of @a denom_pub, may be NULL - * @return transaction status code - */ enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info ( const struct TALER_DenominationPublicKey *denom_pub, @@ -298,7 +268,7 @@ TALER_ARL_get_denomination_info ( * #GNUNET_NO if we had an error on commit (retry may help) * #GNUNET_SYSERR on hard errors */ -static int +static enum GNUNET_GenericReturnValue transact (TALER_ARL_Analysis analysis, void *analysis_cls) { @@ -369,14 +339,7 @@ transact (TALER_ARL_Analysis analysis, } -/** - * Initialize DB sessions and run the analysis. - * - * @param ana analysis to run - * @param ana_cls closure for @a ana - * @return #GNUNET_OK on success - */ -int +enum GNUNET_GenericReturnValue TALER_ARL_setup_sessions_and_run (TALER_ARL_Analysis ana, void *ana_cls) { @@ -424,19 +387,6 @@ test_master_present (void *cls, } -/** - * Perform addition of amounts. If the addition fails, logs - * a detailed error and calls exit() to terminate the process (!). - * - * Do not call this function directly, use #TALER_ARL_amount_add(). - * - * @param[out] sum where to store @a a1 + @a a2, set to "invalid" on overflow - * @param a1 first amount to add - * @param a2 second amount to add - * @param filename where is the addition called - * @param functionname name of the function where the addition is called - * @param line line number of the addition - */ void TALER_ARL_amount_add_ (struct TALER_Amount *sum, const struct TALER_Amount *a1, @@ -485,19 +435,6 @@ TALER_ARL_amount_add_ (struct TALER_Amount *sum, } -/** - * Perform subtraction of amounts. If the subtraction fails, logs - * a detailed error and calls exit() to terminate the process (!). - * - * Do not call this function directly, use #TALER_ARL_amount_subtract(). - * - * @param[out] diff where to store (@a a1 - @a a2) - * @param a1 amount to subtract from - * @param a2 amount to subtract - * @param filename where is the addition called - * @param functionname name of the function where the addition is called - * @param line line number of the addition - */ void TALER_ARL_amount_subtract_ (struct TALER_Amount *diff, const struct TALER_Amount *a1, @@ -546,24 +483,6 @@ TALER_ARL_amount_subtract_ (struct TALER_Amount *diff, } -/** - * Perform subtraction of amounts. Negative results should be signalled by the - * return value (leaving @a diff set to 'invalid'). If the subtraction fails - * for other reasons (currency mismatch, normalization failure), logs a - * detailed error and calls exit() to terminate the process (!). - * - * Do not call this function directly, use #TALER_ARL_amount_subtract_neg(). - * - * @param[out] diff where to store (@a a1 - @a a2) - * @param a1 amount to subtract from - * @param a2 amount to subtract - * @param filename where is the addition called - * @param functionname name of the function where the addition is called - * @param line line number of the addition - * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid), - * #TALER_ARL_SR_ZERO if the result was zero, - * #TALER_ARL_SR_POSITIVE if the result is positive - */ enum TALER_ARL_SubtractionResult TALER_ARL_amount_subtract_neg_ (struct TALER_Amount *diff, const struct TALER_Amount *a1, @@ -622,13 +541,7 @@ handle_sigint (void) } -/** - * Setup global variables based on configuration. - * - * @param c configuration to use - * @return #GNUNET_OK on success - */ -int +enum GNUNET_GenericReturnValue TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) { TALER_ARL_cfg = c; @@ -822,11 +735,6 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c) } -/** - * Generate the report and close connectios to the database. - * - * @param report the report to output, may be NULL for no report - */ void TALER_ARL_done (json_t *report) { diff --git a/src/auditor/report-lib.h b/src/auditor/report-lib.h index 3f4489763..8ef7e048a 100644 --- a/src/auditor/report-lib.h +++ b/src/auditor/report-lib.h @@ -276,7 +276,7 @@ TALER_ARL_amount_subtract_neg_ (struct TALER_Amount *diff, * @param ana_cls closure for @a ana * @return #GNUNET_OK on success */ -int +enum GNUNET_GenericReturnValue TALER_ARL_setup_sessions_and_run (TALER_ARL_Analysis ana, void *ana_cls); @@ -298,7 +298,7 @@ TALER_ARL_do_abort (void); * @param c configuration to use * @return #GNUNET_OK on success */ -int +enum GNUNET_GenericReturnValue TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c); diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c index 694753c8d..7f4d4286c 100644 --- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c +++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c @@ -221,20 +221,6 @@ verify_and_execute_deposit_confirmation ( } -/** - * Handle a "/deposit-confirmation" request. Parses the JSON, and, if - * successful, passes the JSON data to #verify_and_execute_deposit_confirmation() - * to further check the details of the operation specified. If - * everything checks out, this will ultimately lead to the "/deposit-confirmation" - * being stored in the database. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ MHD_RESULT TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, struct MHD_Connection *connection, @@ -323,9 +309,6 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh, } -/** - * Initialize subsystem. - */ void TEAH_DEPOSIT_CONFIRMATION_init (void) { @@ -335,9 +318,6 @@ TEAH_DEPOSIT_CONFIRMATION_init (void) } -/** - * Shut down subsystem. - */ void TEAH_DEPOSIT_CONFIRMATION_done (void) { diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c index 3473a8284..d425b9ead 100644 --- a/src/auditor/taler-helper-auditor-coins.c +++ b/src/auditor/taler-helper-auditor-coins.c @@ -1086,9 +1086,6 @@ struct RevealContext * @param cls closure with a `struct RevealContext *` in it * @param num_freshcoins size of the @a rrcs array * @param rrcs array of @a num_freshcoins information about coins to be created - * @param num_tprivs number of entries in @a tprivs, should be #TALER_CNC_KAPPA - 1 - * @param tprivs array of @e num_tprivs transfer private keys - * @param tp transfer public key information */ static void reveal_data_cb (void *cls, diff --git a/src/exchange-tools/taler-crypto-worker.c b/src/exchange-tools/taler-crypto-worker.c index 2ee98e574..34a153d4a 100644 --- a/src/exchange-tools/taler-crypto-worker.c +++ b/src/exchange-tools/taler-crypto-worker.c @@ -14,7 +14,7 @@ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ /** - * @file util/taler-crypto-worker.c + * @file exchange-tools/taler-crypto-worker.c * @brief Standalone process to perform various cryptographic operations. * @author Florian Dold */ diff --git a/src/exchange-tools/taler-exchange-offline.c b/src/exchange-tools/taler-exchange-offline.c index 3d85d376d..c5c9584d9 100644 --- a/src/exchange-tools/taler-exchange-offline.c +++ b/src/exchange-tools/taler-exchange-offline.c @@ -2525,7 +2525,7 @@ do_download (char *const *args) * Check that the security module keys are the same as before. If we had no * keys in store before, remember them (Trust On First Use). * - * @param secm security module keys, must be an array of length 2 + * @param secmset security module keys * @return #GNUNET_OK if keys match with what we have in store * #GNUNET_NO if we had nothing in store but now do * #GNUNET_SYSERR if keys changed from what we remember or other error @@ -2803,13 +2803,12 @@ show_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub, /** * Output @a denomkeys for human consumption. * - * @param secm_pub security module public key used to sign the denominations - * element 0: RSA - * element 1: CS + * @param secm_pub_rsa security module public key used to sign the RSA denominations + * @param secm_pub_cs security module public key used to sign the CS denominations * @param denomkeys keys to output * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa, const struct TALER_SecurityModulePublicKeyP *secm_pub_cs, const json_t *denomkeys) @@ -3163,7 +3162,7 @@ do_show (char *const *args) * @param[in,out] result array where to output the signatures * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue sign_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub, const json_t *signkeys, json_t *result) @@ -3257,9 +3256,8 @@ sign_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub, /** * Sign @a denomkeys with offline key. * - * @param secm_pub security module public key used to sign the denominations - * element 0: RSA - * element 1: CS + * @param secm_pub_rsa security module public key used to sign the RSA denominations + * @param secm_pub_cs security module public key used to sign the CS denominations * @param denomkeys keys to output * @param[in,out] result array where to output the signatures * @return #GNUNET_OK on success diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index 32b069f90..a2e87e2bf 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -199,7 +199,7 @@ static int test_mode; * Main work function that queries the DB and aggregates transactions * into larger wire transfers. * - * @param cls NULL + * @param cls a `struct Shard *` */ static void run_aggregation (void *cls); @@ -679,12 +679,6 @@ release_shard (struct Shard *s) } -/** - * Main work function that queries the DB and aggregates transactions - * into larger wire transfers. - * - * @param cls a `struct Shard *` - */ static void run_aggregation (void *cls) { diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 5150b32c2..06ad7ca9d 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -188,7 +188,7 @@ static unsigned long long req_max; struct GNUNET_CURL_Context *TEH_curl_ctx; /** - * Context for integrating #exchange_curl_ctx with the + * Context for integrating #TEH_curl_ctx with the * GNUnet event loop. */ static struct GNUNET_CURL_RescheduleContext *exchange_curl_rc; diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index 50ddba604..053552f2a 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -51,6 +51,7 @@ * @param h_contract_terms hash of contract details * @param exchange_timestamp exchange's timestamp * @param refund_deadline until when this deposit be refunded + * @param wire_deadline until when will the exchange wire the funds * @param merchant merchant public key * @param amount_without_fee fraction of coin value to deposit, without the fee * @return MHD result code diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h index 6dbd0d195..b4a14828b 100644 --- a/src/exchange/taler-exchange-httpd_keys.h +++ b/src/exchange/taler-exchange-httpd_keys.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2020 Taler Systems SA + Copyright (C) 2020-2022 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -160,11 +160,12 @@ TEH_keys_denomination_by_hash (const struct TALER_DenominationHash *h_denom_pub, * or NULL if @a h_denom_pub could not be found */ struct TEH_DenominationKey * -TEH_keys_denomination_by_hash2 (struct TEH_KeyStateHandle *ksh, - const struct - TALER_DenominationHash *h_denom_pub, - struct MHD_Connection *conn, - MHD_RESULT *mret); +TEH_keys_denomination_by_hash2 ( + struct TEH_KeyStateHandle *ksh, + const struct TALER_DenominationHash *h_denom_pub, + struct MHD_Connection *conn, + MHD_RESULT *mret); + /** * Request to sign @a msg using the public key corresponding to @@ -183,20 +184,19 @@ TEH_keys_denomination_sign (const struct TALER_DenominationHash *h_denom_pub, /** - * Request to derive CS r_pub using the denomination corresponding to @a h_denom_pub + * Request to derive CS @a r_pub using the denomination corresponding to @a h_denom_pub * and @a nonce. * * @param h_denom_pub hash of the public key to use to derive r_pub * @param nonce withdraw/refresh nonce - * @param[out] ec set to the error code (or #TALER_EC_NONE on success) - * @return r_pub, the value inside the structure will be NULL on failure, - * see @a ec for details about the failure + * @param[out] r_pub where to write the result + * @return #TALER_EC_NONE on success */ enum TALER_ErrorCode -TEH_keys_denomination_cs_r_pub (const struct - TALER_DenominationHash *h_denom_pub, - const struct TALER_CsNonce *nonce, - struct TALER_DenominationCSPublicRPairP *r_pub); +TEH_keys_denomination_cs_r_pub ( + const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_CsNonce *nonce, + struct TALER_DenominationCSPublicRPairP *r_pub); /** diff --git a/src/exchange/taler-exchange-httpd_recoup-refresh.h b/src/exchange/taler-exchange-httpd_recoup-refresh.h index 25c12fac3..94ae7f889 100644 --- a/src/exchange/taler-exchange-httpd_recoup-refresh.h +++ b/src/exchange/taler-exchange-httpd_recoup-refresh.h @@ -14,7 +14,7 @@ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ /** - * @file taler-exchange-httpd_recoup_refresh.h + * @file taler-exchange-httpd_recoup-refresh.h * @brief Handle /recoup-refresh requests * @author Christian Grothoff */ diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c index c8af86340..2a1eb8c42 100644 --- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c +++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c @@ -36,7 +36,7 @@ * * @param connection the connection to send the response to * @param num_freshcoins number of new coins for which we reveal data - * @param sigs array of @a num_freshcoins signatures revealed + * @param rrcs array of @a num_freshcoins signatures revealed * @return a MHD result code */ static MHD_RESULT diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c index 8aa54712c..55b230444 100644 --- a/src/exchange/taler-exchange-httpd_responses.c +++ b/src/exchange/taler-exchange-httpd_responses.c @@ -538,18 +538,6 @@ TEH_RESPONSE_reply_invalid_denom_cipher_for_operation ( } -/** - * Send proof that a request is invalid to client because of - * insufficient funds. This function will create a message with all - * of the operations affecting the coin that demonstrate that the coin - * has insufficient value. - * - * @param connection connection to the client - * @param ec error code to return - * @param coin_pub public key of the coin - * @param tl transaction list to use to build reply - * @return MHD result code - */ MHD_RESULT TEH_RESPONSE_reply_coin_insufficient_funds ( struct MHD_Connection *connection, diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c index d378bdabc..e80c775ef 100644 --- a/src/exchange/taler-exchange-httpd_wire.c +++ b/src/exchange/taler-exchange-httpd_wire.c @@ -107,7 +107,7 @@ wire_update_event_cb (void *cls, } -int +enum GNUNET_GenericReturnValue TEH_wire_init () { struct GNUNET_DB_EventHeaderP es = { @@ -147,8 +147,7 @@ TEH_wire_done () /** - * Create standard JSON response format using - * @param ec and @a detail + * Create standard JSON response format using @a ec and @a detail. * * @param ec error code to return * @param detail optional detail text to return, can be NULL diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 7b8763eb6..ecfa33591 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -3880,7 +3880,7 @@ postgres_select_kyc_status (void *cls, * Get the KYC status for a wallet. If the status is unknown, * inserts a new status record (hence INsertSELECT). * - * @param cls the @e cls of this struct with the plugin-specific state + * @param pg the plugin-specific state * @param payto_uri the payto URI to check * @param oauth_username user ID to store * @param[out] kyc set to the KYC status of the wallet @@ -4365,7 +4365,7 @@ postgres_get_withdraw_info ( * @param now current time (rounded) * @param[out] found set to true if the reserve was found * @param[out] balance_ok set to true if the balance was sufficient - * @param[out] kyc_ok set to true if the kyc status of the reserve is satisfied + * @param[out] kyc set to true if the kyc status of the reserve is satisfied * @param[out] ruuid set to the reserve's UUID (reserves table row) * @return query execution status */ @@ -4458,9 +4458,9 @@ postgres_do_withdraw_limit_check ( /** - * Compute the shard number of a given @a deposit + * Compute the shard number of a given @a merchant_pub. * - * @param deposit deposit to compute shard for + * @param merchant_pub merchant public key to compute shard for * @return shard number */ static uint64_t @@ -4490,11 +4490,11 @@ compute_shard (const struct TALER_MerchantPublicKeyP *merchant_pub) * Perform deposit operation, checking for sufficient balance * of the coin and possibly persisting the deposit details. * - * FIXME: parameters missing in description! - * * @param cls the `struct PostgresClosure` with the plugin-specific state * @param deposit deposit operation details * @param known_coin_id row of the coin in the known_coins table + * @param h_payto hash of the merchant's bank account details + * @param extension_blocked true if an extension is blocking the wire transfer * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated) * @param[out] balance_ok set to true if the balance was sufficient * @param[out] in_conflict set to true if the deposit conflicted diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 3a4278298..62a958f76 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -1052,7 +1052,7 @@ TALER_cs_refresh_nonce_derive ( * be passed. * * @param[out] denom_priv where to write the private key - * @param[out] deonm_pub where to write the public key + * @param[out] denom_pub where to write the public key * @param cipher which type of cipher to use * @param ... RSA key size (eg. 2048/3072/4096) * @return #GNUNET_OK on success, #GNUNET_NO if parameters were invalid @@ -2219,7 +2219,7 @@ TALER_wallet_deposit_verify ( /** * Sign a melt request. * - * @param amount the amount to be melted (with fee) + * @param amount_with_fee the amount to be melted (with fee) * @param melt_fee the melt fee we expect to pay * @param rc refresh session we are committed to * @param h_denom_pub hash of the coin denomination's public key @@ -2239,7 +2239,7 @@ TALER_wallet_melt_sign ( /** * Verify a melt request. * - * @param amount the amount to be melted (with fee) + * @param amount_with_fee the amount to be melted (with fee) * @param melt_fee the melt fee we expect to pay * @param rc refresh session we are committed to * @param h_denom_pub hash of the coin denomination's public key @@ -2369,7 +2369,6 @@ TALER_wallet_recoup_verify ( * * @param h_denom_pub hash of the denomiantion public key of the coin * @param coin_bks blinding factor used when withdrawing the coin - * @param requested_amount amount that is left to be recouped * @param coin_priv coin key of the coin to be recouped * @param coin_sig resulting signature */ @@ -2403,7 +2402,6 @@ TALER_wallet_recoup_refresh_verify ( * * @param h_denom_pub hash of the denomiantion public key of the coin * @param coin_bks blinding factor used when withdrawing the coin - * @param requested_amount amount that is left to be recouped * @param coin_priv coin key of the coin to be recouped * @param coin_sig resulting signature */ diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 1cd90c28f..13ba74053 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -2538,6 +2538,7 @@ struct TALER_EXCHANGEDB_Plugin * @param deposit deposit operation details * @param known_coin_id row of the coin in the known_coins table * @param h_payto hash of the merchant's payto URI + * @param extension_blocked true if an extension is blocking the wire transfer * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated) * @param[out] balance_ok set to true if the balance was sufficient * @param[out] in_conflict set to true if the deposit conflicted diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index fef733917..b7bcd845f 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -608,7 +608,7 @@ TALER_JSON_extensions_config_hash (const json_t *config, struct TALER_ExtensionConfigHash *eh); /** - * Parses a JSON object { "extension": "age_restriction", "mask": <uint32> }. + * Parses a JSON object `{ "extension": "age_restriction", "mask": uint32 }`. * * @param root is the json object * @param[out] mask on succes, will contain the age mask diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index 037955096..fc10f9a13 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -1215,7 +1215,7 @@ struct TALER_MerchantWireDetailsPS /** * Salted hash over the account holder's payto:// URL and - * the salt, as done by #TALER_exchange_wire_signature_hash(). + * the salt, as done by #TALER_merchant_wire_signature_hash(). */ struct TALER_MerchantWireHash h_wire_details GNUNET_PACKED; diff --git a/src/include/taler_util.h b/src/include/taler_util.h index f64811a46..64df12a7c 100644 --- a/src/include/taler_util.h +++ b/src/include/taler_util.h @@ -329,7 +329,7 @@ TALER_payto_get_method (const char *payto_uri); /** * Construct a payto://-URI from a Taler @a reserve_pub at - * a @exchange_base_url + * @a exchange_base_url * * @param exchange_base_url the URL of the exchange * @param reserve_pub public key of the reserve diff --git a/src/util/crypto_helper_rsa.c b/src/util/crypto_helper_rsa.c index fbfc97702..75fe33c03 100644 --- a/src/util/crypto_helper_rsa.c +++ b/src/util/crypto_helper_rsa.c @@ -14,7 +14,7 @@ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ /** - * @file util/crypto_helper_denom.c + * @file util/crypto_helper_rsa.c * @brief utility functions for running out-of-process private key operations * @author Christian Grothoff */ diff --git a/src/util/taler-exchange-secmod-cs.h b/src/util/taler-exchange-secmod-cs.h index a6cbfcf23..c090e5cd1 100644 --- a/src/util/taler-exchange-secmod-cs.h +++ b/src/util/taler-exchange-secmod-cs.h @@ -73,7 +73,7 @@ struct TALER_CRYPTO_CsKeyAvailableNotification /** * Signature affirming the announcement, of - * purpose #TALER_SIGNATURE_SM_DENOMINATION_KEY. + * purpose #TALER_SIGNATURE_SM_CS_DENOMINATION_KEY. */ struct TALER_SecurityModuleSignatureP secm_sig; diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c index 06c42a028..402e43196 100644 --- a/src/util/taler-exchange-secmod-rsa.c +++ b/src/util/taler-exchange-secmod-rsa.c @@ -232,7 +232,7 @@ static uint64_t key_gen; /** * Generate the announcement message for @a dk. * - * @param[in,out] denomination key to generate the announcement for + * @param[in,out] dk denomination key to generate the announcement for */ static void generate_response (struct DenominationKey *dk) diff --git a/src/util/taler-exchange-secmod-rsa.h b/src/util/taler-exchange-secmod-rsa.h index 61fa58811..625ff87d9 100644 --- a/src/util/taler-exchange-secmod-rsa.h +++ b/src/util/taler-exchange-secmod-rsa.h @@ -73,7 +73,7 @@ struct TALER_CRYPTO_RsaKeyAvailableNotification /** * Signature affirming the announcement, of - * purpose #TALER_SIGNATURE_SM_DENOMINATION_KEY. + * purpose #TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY. */ struct TALER_SecurityModuleSignatureP secm_sig; |