1 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/exchange_api_management_revoke_signing_key.c b/src/lib/exchange_api_management_revoke_signing_key.c
index f43a46c40..d2fa78264 100644
--- a/src/lib/exchange_api_management_revoke_signing_key.c
+++ b/src/lib/exchange_api_management_revoke_signing_key.c
@@ -23,6 +23,7 @@
 #include "taler_json_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_exchange_service.h"
+#include "exchange_api_curl_defaults.h"
 #include "taler_signatures.h"
 #include "taler_curl_lib.h"
 #include "taler_json_lib.h"
@@ -78,9 +79,9 @@ handle_revoke_signing_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse rsr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   rh->job = NULL;
@@ -88,30 +89,30 @@ handle_revoke_signing_finished (void *cls,
   {
   case 0:
     /* no reply */
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    hr.hint = "server offline?";
+    rsr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rsr.hr.hint = "server offline?";
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rsr.hr.ec = TALER_JSON_get_error_code (json);
+    rsr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rsr.hr.ec = TALER_JSON_get_error_code (json);
+    rsr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management revoke signkey\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rsr.hr.ec);
     break;
   }
   if (NULL != rh->cb)
   {
     rh->cb (rh->cb_cls,
-            &hr);
+            &rsr);
     rh->cb = NULL;
   }
   TALER_EXCHANGE_management_revoke_signing_key_cancel (rh);
@@ -163,26 +164,25 @@ TALER_EXCHANGE_management_revoke_signing_key (
   body = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_data_auto ("master_sig",
                                 master_sig));
-  eh = curl_easy_init ();
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&rh->post_ctx,
-                            eh,
-                            body))
+  eh = TALER_EXCHANGE_curl_easy_get_ (rh->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&rh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (rh->url);
-    GNUNET_free (eh);
+    GNUNET_free (rh);
     return NULL;
   }
   json_decref (body);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Requesting URL '%s'\n",
               rh->url);
-  GNUNET_assert (CURLE_OK == curl_easy_setopt (eh,
-                                               CURLOPT_URL,
-                                               rh->url));
   rh->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   rh->post_ctx.headers,