1 files changed, 7 insertions, 18 deletions

diff --git a/src/anastasis/anastasis-gtk_handle-challenge-code.c b/src/anastasis/anastasis-gtk_handle-challenge-code.c
index 7a993da..4f42023 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-code.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-code.c
@@ -49,6 +49,7 @@ anastasis_gtk_c_code_dialog_response_cb (GtkDialog *dialog,
   json_t *args;
   unsigned long long pin;
   char dummy;
+  char s[16];
 
   if (GTK_RESPONSE_OK != response_id)
   {
@@ -65,20 +66,15 @@ anastasis_gtk_c_code_dialog_response_cb (GtkDialog *dialog,
   q = GTK_ENTRY (gtk_builder_get_object (builder,
                                          "anastasis_gtk_c_code_entry"));
   qs = gtk_entry_get_text (q);
-  if ( (NULL != qs) &&
-       (0 == strncasecmp ("a-", qs, 2)) )
-    qs += 2; /* skip "A-" prefix if present */
-  if (1 != sscanf (qs,
-                   "%llu%c",
-                   &pin,
-                   &dummy))
+  if (! ANASTASIS_scan_pin (qs,
+                            &pin))
   {
     GNUNET_break (0);
     return;
   }
   args = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_uint64 ("pin",
-                             pin));
+                             (uint64_t) pin));
   gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (builder));
   AG_freeze ();
@@ -98,21 +94,14 @@ anastasis_gtk_c_code_dialog_answer_entry_changed_cb (GtkEntry *entry,
   GtkBuilder *builder = GTK_BUILDER (user_data);
   GtkEntry *a;
   const char *as;
-  unsigned int pin;
-  char dummy;
+  unsigned long long pin;
   bool ok;
 
   a = GTK_ENTRY (gtk_builder_get_object (builder,
                                          "anastasis_gtk_c_code_entry"));
   as = gtk_entry_get_text (a);
-  if ( (NULL != as) &&
-       (0 == strncasecmp ("a-", as, 2)) )
-    as += 2; /* skip "A-" prefix if present */
-  ok = ( (NULL != as) &&
-         (1 == sscanf (as,
-                       "%u%c",
-                       &pin,
-                       &dummy)) );
+  ok = ANASTASIS_scan_pin (as,
+                           &pin);
   gtk_widget_set_sensitive (
     GTK_WIDGET (gtk_builder_get_object (builder,
                                         "anastasis_gtk_c_code_dialog_btn_ok")),