commit d16b3bbc93900354eb5ec7ce56564301ea9eb53f
parent ed8cfc8562f34e2b8affb0145ae3e471855c98f7
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 5 Mar 2026 21:08:28 +0100
fix #11204
Diffstat:
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -1350,7 +1350,7 @@ run (void *cls,
GNUNET_free (tan_channels);
return;
}
- TEH_mandatory_tan_channels |= TEH_TCS_SMS;
+ TEH_mandatory_tan_channels |= TMH_TCS_SMS;
}
else if (0 == strcasecmp (tok,
"email"))
@@ -1366,7 +1366,7 @@ run (void *cls,
GNUNET_free (tan_channels);
return;
}
- TEH_mandatory_tan_channels |= TEH_TCS_EMAIL;
+ TEH_mandatory_tan_channels |= TMH_TCS_EMAIL;
}
else
{
diff --git a/src/backend/taler-merchant-httpd.h b/src/backend/taler-merchant-httpd.h
@@ -833,10 +833,10 @@ extern int TMH_have_self_provisioning;
*/
enum TEH_TanChannelSet
{
- TEH_TCS_NONE = 0,
- TEH_TCS_SMS = 1,
- TEH_TCS_EMAIL = 2,
- TEH_TCS_EMAIL_AND_SMS = 3
+ TMH_TCS_NONE = 0,
+ TMH_TCS_SMS = 1,
+ TMH_TCS_EMAIL = 2,
+ TMH_TCS_EMAIL_AND_SMS = 3
};
diff --git a/src/backend/taler-merchant-httpd_get-config.c b/src/backend/taler-merchant-httpd_get-config.c
@@ -138,11 +138,11 @@ MH_handler_config (const struct TMH_RequestHandler *rh,
rgs);
TMH_exchange_get_trusted (&add_exchange,
exchanges);
- if (0 != (TEH_TCS_SMS & TEH_mandatory_tan_channels))
+ if (0 != (TMH_TCS_SMS & TEH_mandatory_tan_channels))
GNUNET_assert (0 ==
json_array_append_new (mtc,
json_string ("sms")));
- if (0 != (TEH_TCS_EMAIL & TEH_mandatory_tan_channels))
+ if (0 != (TMH_TCS_EMAIL & TEH_mandatory_tan_channels))
GNUNET_assert (0 ==
json_array_append_new (mtc,
json_string ("email")));
diff --git a/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c b/src/backend/taler-merchant-httpd_patch-management-instances-INSTANCE.c
@@ -252,7 +252,7 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
enum TEH_TanChannelSet mtc = TEH_mandatory_tan_channels;
- if ( (0 != (mtc & TEH_TCS_SMS)) &&
+ if ( (0 != (mtc & TMH_TCS_SMS)) &&
(NULL != mi->settings.phone) &&
(NULL == is.phone) )
{
@@ -265,7 +265,7 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
TALER_EC_GENERIC_PARAMETER_MISSING,
"phone_number");
}
- if ( (0 != (mtc & TEH_TCS_EMAIL)) &&
+ if ( (0 != (mtc & TMH_TCS_EMAIL)) &&
(NULL != mi->settings.email) &&
(NULL == is.email) )
{
@@ -280,18 +280,18 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
}
if ( (is.phone_validated ||
(NULL == is.phone) ) &&
- (0 != (mtc & TEH_TCS_SMS)) )
- mtc -= TEH_TCS_SMS;
+ (0 != (mtc & TMH_TCS_SMS)) )
+ mtc -= TMH_TCS_SMS;
if ( (is.email_validated ||
(NULL == is.email) ) &&
- (0 != (mtc & TEH_TCS_EMAIL)) )
- mtc -= TEH_TCS_EMAIL;
+ (0 != (mtc & TMH_TCS_EMAIL)) )
+ mtc -= TMH_TCS_EMAIL;
switch (mtc)
{
- case TEH_TCS_NONE:
+ case TMH_TCS_NONE:
ret = GNUNET_OK;
break;
- case TEH_TCS_SMS:
+ case TMH_TCS_SMS:
GNUNET_assert (NULL != is.phone);
is.phone_validated = true;
/* validate new phone number, if possible require old e-mail
@@ -308,7 +308,7 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
mi->settings.email,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL:
+ case TMH_TCS_EMAIL:
GNUNET_assert (NULL != is.email);
is.email_validated = true;
/* validate new e-mail address, if possible require old phone
@@ -325,9 +325,9 @@ patch_instances_ID (struct TMH_MerchantInstance *mi,
mi->settings.phone,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL_AND_SMS:
- GNUNET_assert (NULL != mi->settings.phone);
- GNUNET_assert (NULL != mi->settings.email);
+ case TMH_TCS_EMAIL_AND_SMS:
+ GNUNET_assert (NULL != is.phone);
+ GNUNET_assert (NULL != is.email);
is.phone_validated = true;
is.email_validated = true;
/* To change both, we require both old and both new
diff --git a/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c b/src/backend/taler-merchant-httpd_post-management-instances-INSTANCE-auth.c
@@ -70,7 +70,7 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi,
return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
}
- if ( (0 != (tcs & TEH_TCS_SMS) &&
+ if ( (0 != (tcs & TMH_TCS_SMS) &&
( (NULL == mi->settings.phone) ||
(NULL == TMH_helper_sms) ||
(! mi->settings.phone_validated) ) ) )
@@ -83,7 +83,7 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi,
TALER_EC_MERCHANT_GENERIC_MFA_MISSING,
"phone_number");
}
- if ( (0 != (tcs & TEH_TCS_EMAIL) &&
+ if ( (0 != (tcs & TMH_TCS_EMAIL) &&
( (NULL == mi->settings.email) ||
(NULL == TMH_helper_email) ||
(! mi->settings.email_validated) ) ) )
@@ -102,10 +102,10 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi,
switch (tcs)
{
- case TEH_TCS_NONE:
+ case TMH_TCS_NONE:
ret = GNUNET_OK;
break;
- case TEH_TCS_SMS:
+ case TMH_TCS_SMS:
ret = TMH_mfa_challenges_do (hc,
TALER_MERCHANT_MFA_CO_AUTH_CONFIGURATION,
true,
@@ -113,7 +113,7 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi,
mi->settings.phone,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL:
+ case TMH_TCS_EMAIL:
ret = TMH_mfa_challenges_do (hc,
TALER_MERCHANT_MFA_CO_AUTH_CONFIGURATION,
true,
@@ -121,7 +121,7 @@ post_instances_ID_auth (struct TMH_MerchantInstance *mi,
mi->settings.email,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL_AND_SMS:
+ case TMH_TCS_EMAIL_AND_SMS:
ret = TMH_mfa_challenges_do (hc,
TALER_MERCHANT_MFA_CO_AUTH_CONFIGURATION,
true,
@@ -282,7 +282,7 @@ TMH_private_post_instances_ID_auth (const struct TMH_RequestHandler *rh,
connection,
hc,
false,
- TEH_TCS_NONE);
+ TMH_TCS_NONE);
}
@@ -334,7 +334,7 @@ TMH_private_post_instances_default_ID_auth (
connection,
hc,
true,
- TEH_TCS_NONE);
+ TMH_TCS_NONE);
return ret;
}
diff --git a/src/backend/taler-merchant-httpd_post-management-instances.c b/src/backend/taler-merchant-httpd_post-management-instances.c
@@ -363,7 +363,7 @@ post_instances (const struct TMH_RequestHandler *rh,
{
enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
- if ( (0 != (TEH_TCS_SMS & TEH_mandatory_tan_channels)) &&
+ if ( (0 != (TMH_TCS_SMS & TEH_mandatory_tan_channels)) &&
(NULL == is.phone) )
{
GNUNET_break_op (0);
@@ -375,7 +375,7 @@ post_instances (const struct TMH_RequestHandler *rh,
"phone_number");
}
- if ( (0 != (TEH_TCS_EMAIL & TEH_mandatory_tan_channels)) &&
+ if ( (0 != (TMH_TCS_EMAIL & TEH_mandatory_tan_channels)) &&
(NULL == is.email) )
{
GNUNET_break_op (0);
@@ -388,11 +388,11 @@ post_instances (const struct TMH_RequestHandler *rh,
}
switch (TEH_mandatory_tan_channels)
{
- case TEH_TCS_NONE:
+ case TMH_TCS_NONE:
GNUNET_assert (0);
ret = GNUNET_OK;
break;
- case TEH_TCS_SMS:
+ case TMH_TCS_SMS:
is.phone_validated = true;
ret = TMH_mfa_challenges_do (hc,
TALER_MERCHANT_MFA_CO_INSTANCE_PROVISION,
@@ -401,7 +401,7 @@ post_instances (const struct TMH_RequestHandler *rh,
is.phone,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL:
+ case TMH_TCS_EMAIL:
is.email_validated = true;
ret = TMH_mfa_challenges_do (hc,
TALER_MERCHANT_MFA_CO_INSTANCE_PROVISION,
@@ -410,7 +410,7 @@ post_instances (const struct TMH_RequestHandler *rh,
is.email,
TALER_MERCHANT_MFA_CHANNEL_NONE);
break;
- case TEH_TCS_EMAIL_AND_SMS:
+ case TMH_TCS_EMAIL_AND_SMS:
is.phone_validated = true;
is.email_validated = true;
ret = TMH_mfa_challenges_do (hc,
@@ -686,7 +686,7 @@ TMH_public_post_instances (const struct TMH_RequestHandler *rh,
connection,
hc,
expiration,
- TEH_TCS_NONE !=
+ TMH_TCS_NONE !=
TEH_mandatory_tan_channels);
}
