challenger

commit d72290da07b9e266dead9d040b08205b2e011452
parent 01e63324479c4cdf0e2270d1e8424a0e1715cfd8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 12 Jan 2025 09:37:47 +0100

-fix configure check for libtalermhd

Diffstat:
M
configure.ac
 | 
4
++--
M
src/challenger/challenger-httpd_common.c
 | 
2
+-
M
src/challenger/challenger-httpd_common.h
 | 
2
+-
M
src/challenger/challenger-httpd_token.c
 | 
38
+++++++++++++++++++-------------------

4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -122,12 +122,12 @@ AS_CASE([$with_exchange],
          CPPFLAGS="-I$with_exchange/include $CPPFLAGS $POSTGRESQL_CPPFLAGS"])
 
 AC_CHECK_HEADERS([taler/taler_mhd_lib.h],
- [AC_CHECK_LIB([talermhd], [TALER_MHD_check_accept], libtalermhd=1)])
+ [AC_CHECK_LIB([talermhd], [TALER_MHD_reply_with_error], libtalermhd=1)])
 AM_CONDITIONAL(HAVE_TALERMHD, test x$libtalermhd = x1)
 AS_IF([test $libtalermhd != 1],
   [AC_MSG_ERROR([[
 ***
-*** You need libtalermhd >= 0.10.3 (API v3) to build this program.
+*** You need libtalermhd >= 0.14.3 (API v3) to build this program.
 *** This library is part of the GNU Taler exchange, available at
 ***   https://taler.net
 *** ]])])
diff --git a/src/challenger/challenger-httpd_common.c b/src/challenger/challenger-httpd_common.c
@@ -152,7 +152,7 @@ CH_code_to_nonce (const char *code,
 
 
 MHD_RESULT
-TALER_MHD_reply_with_oauth_error (
+CH_reply_with_oauth_error (
   struct MHD_Connection *connection,
   unsigned int http_status,
   const char *oauth_error,
diff --git a/src/challenger/challenger-httpd_common.h b/src/challenger/challenger-httpd_common.h
@@ -89,7 +89,7 @@ CH_code_to_nonce (const char *code,
  * @return a MHD result code
  */
 MHD_RESULT
-TALER_MHD_reply_with_oauth_error (
+CH_reply_with_oauth_error (
   struct MHD_Connection *connection,
   unsigned int http_status,
   const char *oauth_error,
diff --git a/src/challenger/challenger-httpd_token.c b/src/challenger/challenger-httpd_token.c
@@ -234,7 +234,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
                      "authorization_code")) )
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_BAD_REQUEST,
       "unsupported_grant_type",
@@ -245,7 +245,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
   if (NULL == bc->code)
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_BAD_REQUEST,
       "invalid_request",
@@ -255,7 +255,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
   if (NULL == bc->client_secret)
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_BAD_REQUEST,
       "invalid_client",
@@ -265,7 +265,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
   if (NULL == bc->client_id)
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_BAD_REQUEST,
       "invalid_client",
@@ -275,7 +275,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
   if (NULL == bc->redirect_uri)
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_BAD_REQUEST,
       "invalid_request",
@@ -296,7 +296,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
                      &dummy))
     {
       GNUNET_break_op (0);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_BAD_REQUEST,
         "invalid_client",
@@ -323,7 +323,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
       return MHD_NO;
     case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
       GNUNET_break_op (0);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_UNAUTHORIZED,
         "invalid_client",
@@ -337,7 +337,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
                        bc->redirect_uri)) )
     {
       GNUNET_break_op (0);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_UNAUTHORIZED,
         "invalid_client",
@@ -352,7 +352,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
                         &bc->nonce))
   {
     GNUNET_break_op (0);
-    return TALER_MHD_reply_with_oauth_error (
+    return CH_reply_with_oauth_error (
       hc->connection,
       MHD_HTTP_UNAUTHORIZED,
       "invalid_grant",
@@ -396,7 +396,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
       return MHD_NO;
     case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
       GNUNET_break_op (0);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_UNAUTHORIZED,
         "invalid_grant",
@@ -429,7 +429,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
         GNUNET_free (client_redirect_uri);
         GNUNET_free (client_state);
         GNUNET_free (code_challenge);
-        return TALER_MHD_reply_with_oauth_error (
+        return CH_reply_with_oauth_error (
           hc->connection,
           MHD_HTTP_UNAUTHORIZED,
           "invalid_grant",
@@ -458,7 +458,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
             GNUNET_free (client_redirect_uri);
             GNUNET_free (client_state);
             GNUNET_free (code_challenge);
-            return TALER_MHD_reply_with_oauth_error (
+            return CH_reply_with_oauth_error (
               hc->connection,
               MHD_HTTP_INTERNAL_SERVER_ERROR,
               "server_error",
@@ -490,7 +490,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
             GNUNET_free (client_redirect_uri);
             GNUNET_free (client_state);
             GNUNET_free (code_challenge);
-            return TALER_MHD_reply_with_oauth_error (
+            return CH_reply_with_oauth_error (
               hc->connection,
               MHD_HTTP_INTERNAL_SERVER_ERROR,
               "server_error",
@@ -507,7 +507,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
             GNUNET_free (client_redirect_uri);
             GNUNET_free (client_state);
             GNUNET_free (code_challenge);
-            return TALER_MHD_reply_with_oauth_error (
+            return CH_reply_with_oauth_error (
               hc->connection,
               MHD_HTTP_UNAUTHORIZED,
               "invalid_grant",
@@ -527,7 +527,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
             GNUNET_free (client_redirect_uri);
             GNUNET_free (client_state);
             GNUNET_free (code_challenge);
-            return TALER_MHD_reply_with_oauth_error (
+            return CH_reply_with_oauth_error (
               hc->connection,
               MHD_HTTP_UNAUTHORIZED,
               "invalid_grant",
@@ -544,7 +544,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
         GNUNET_free (client_redirect_uri);
         GNUNET_free (client_state);
         GNUNET_free (code_challenge);
-        return TALER_MHD_reply_with_oauth_error (
+        return CH_reply_with_oauth_error (
           hc->connection,
           MHD_HTTP_INTERNAL_SERVER_ERROR,
           "server_error",
@@ -561,7 +561,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
       GNUNET_free (client_redirect_uri);
       GNUNET_free (client_state);
       GNUNET_free (code_challenge);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_CONFLICT,
         "invalid_request",
@@ -583,7 +583,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
     {
       GNUNET_break_op (0);
       GNUNET_free (code);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_UNAUTHORIZED,
         "invalid_grant",
@@ -622,7 +622,7 @@ CH_handler_token (struct CH_HandlerContext *hc,
       return MHD_NO;
     case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
       GNUNET_break (0);
-      return TALER_MHD_reply_with_oauth_error (
+      return CH_reply_with_oauth_error (
         hc->connection,
         MHD_HTTP_UNAUTHORIZED,
         "invalid_grant",