commit c71fb99262d0792313092fca2f354e04813b9e76
parent 16aff8b4e9ae61b2c29895ae796f8d2abbd52638
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 21 Jun 2025 23:23:34 +0200
protocol change for #9874: prog_name should be optional
Diffstat:
2 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
@@ -60,7 +60,7 @@ possibly by using HTTPS.
as well as the list of possible KYC requirements. This endpoint is largely
for the SPA for AML officers. Merchants should use ``/keys`` which also
contains the protocol version and currency.
- This specification corresponds to ``current`` protocol being **v29**.
+ This specification corresponds to ``current`` protocol being **v30**.
**Response:**
@@ -2865,7 +2865,7 @@ Coin History
// of purpose ``TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND``.
exchange_sig: EddsaSignature;
- // Public key used to sign 'exchange_sig'.
+ // Public key used to sign 'exchange_sig'.
exchange_pub: EddsaPublicKey;
// Public key of the purse that expired.
@@ -5307,7 +5307,8 @@ and freeze or unfreeze accounts suspected of money laundering.
check_name: string;
// Name of an AML program.
- prog_name: string;
+ // Optional @since protocol **v30**.
+ prog_name?: string;
// Context for the check. Optional.
context?: Object;
diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst
@@ -13,7 +13,6 @@ Synopsis
========
**taler-merchant-httpd**
-[**-a**_|_**--auth**]
[**-C** | **--connection-close**]
[**-c** *FILENAME* | **--config=**\ \ *FILENAME*]
[**-h** | **--help**]
@@ -33,19 +32,6 @@ before running this command.
Options
=======
-**-a** *TOKEN* \| **--auth=**\ \ *TOKEN*
- Use TOKEN for initial access control to the merchant backend. TOKEN must start with the "secret-token:" prefix, as per RFC 8959. The value
- given in TOKEN must appear in backoffice requests to the default instance
- of the merchant, i.e. "Authorization: Bearer TOKEN" to obtain
- access to the merchant backend. Note that setting a passphrase for the
- default instance by any means will block future access via TOKEN. This
- is basically a way to reset the passphrase protecting access. TOKEN
- should be a "pchar" as per RFC 8959, but this is NOT checked. Note that
- TOKEN will only grant access to the 'default' instance, not other instances.
- Instead of using the command-line, which exposes TOKEN to users on the
- system, you may want to consider setting the
- TALER_MERCHANT_TOKEN environment variable instead.
-
**-C** \| **--connection-close**
Force each HTTP connection to be closed after each request
(useful in combination with -f to avoid having to wait for nc to
@@ -82,14 +68,6 @@ SIGTERM
cleanly.
-Environment Variables
-=====================
-
-TALER_MERCHANT_TOKEN
- Like the "-a" option, resets the access token for the default
- instance to the given value.
-
-
See Also
========
