From a42d7df64e18705cef7cd04ac36fd7dbace80268 Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Mon, 22 Mar 2021 20:06:33 +0100
Subject: fix #6808: gnunet-bcd card generation

---
 ChangeLog                       |  3 ---
 doc/handbook/chapters/user.texi | 14 +++++++++++++-
 src/gns/Makefile.am             |  1 +
 src/gns/gnunet-bcd.c            | 22 +++++++++++-----------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49a0cdc74..9c05a51a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,9 +34,6 @@ HELLO: Fix netdb.h nonsense with h_addr - Martin Schanzenbach
 Tue, 23 Feb 2021 10:42:57 +0100 (74a234f0b)
 HANDBOOK: Add some info on TNG - Martin Schanzenbach
 
-Sun, 21 Feb 2021 21:02:57 +0100 (03b5746e4)
-TNG: Add a the api test; WIP - Martin Schanzenbach
-
 Sun, 21 Feb 2021 20:56:47 +0100 (05040a491)
 HELLO: Add test for NG API; fix extraction more - Martin Schanzenbach
 
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index a25dd8bd3..b5889891b 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -254,7 +254,6 @@ and development.
 @subsection Creating a Business Card
 @c FIXME: Which parts of texlive are needed? Some systems offer a modular
 @c texlive (smaller size).
-
 Before we can really use GNS, you should create a business card.
 Note that this requires having @command{LaTeX} installed on your system.
 If you are using a Debian GNU/Linux based operating system, the
@@ -262,6 +261,19 @@ following command should install the required components.
 Keep in mind that this @b{requires 3GB} of downloaded data and possibly
 @b{even more} when unpacked. On a GNU Guix based system texlive 2017 has
 returns a DAG size of 5032.4 MiB.
+The packages which are confirmed to be required are:
+
+@itemize @bullet
+@item texlive-units
+@item texlive-labels
+@item texlive-pst-barcode
+@item texlive-luatex85
+@item texlive-preview
+@item texlive-pdfcrop
+@item texlive-koma-script
+@end itemize
+
+
 @b{We welcome any help in identifying the required components of the
 TexLive Distribution. This way we could just state the required components
 without pulling in the full distribution of TexLive.}
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 9f03311e1..b35836233 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -156,6 +156,7 @@ gnunet_bcd_SOURCES = \
  gnunet-bcd.c
 gnunet_bcd_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
   $(GN_LIBINTL) $(MHD_LIBS)
 gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c
index f71f477ef..a2e94089c 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/gns/gnunet-bcd.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include <microhttpd.h>
 #include "gnunet_util_lib.h"
+#include "gnunet_identity_service.h"
 #include "gnunet_mhd_compat.h"
 
 /**
@@ -148,7 +149,7 @@ access_handler_callback (void *cls,
     char *p;
     char *tmp;
     char *deffile;
-    struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+    struct GNUNET_IDENTITY_PublicKey pub;
     size_t slen;
     FILE *f;
     struct stat st;
@@ -166,9 +167,8 @@ access_handler_callback (void *cls,
       MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "gnskey");
     if ((NULL == gnskey) ||
         (GNUNET_OK !=
-         GNUNET_CRYPTO_ecdsa_public_key_from_string (gnskey,
-                                                     strlen (gnskey),
-                                                     &pub)))
+         GNUNET_IDENTITY_public_key_from_string (gnskey,
+                                                 &pub)))
     {
       return MHD_queue_response (connection,
                                  MHD_HTTP_OK,
@@ -218,10 +218,10 @@ access_handler_callback (void *cls,
              (NULL == gns_nick) ? "" : gns_nick);
     fclose (f);
     GNUNET_asprintf (
-      &p,
-      "cd %s; cp %s gns-bcd.tex | pdflatex --enable-write18 gns-bcd.tex > /dev/null 2> /dev/null",
-      tmp,
-      resfile);
+                     &p,
+                     "cd %s; cp %s gns-bcd.tex | pdflatex --enable-write18 gns-bcd.tex > /dev/null 2> /dev/null",
+                     tmp,
+                     resfile);
     GNUNET_free (deffile);
     ret = system (p);
     if (WIFSIGNALED (ret) || (0 != WEXITSTATUS (ret)))
@@ -506,7 +506,7 @@ main (int argc, char *const *argv)
                                  "port",
                                  "PORT",
                                  gettext_noop (
-                                   "Run HTTP serve on port PORT (default is 8888)"),
+                                               "Run HTTP serve on port PORT (default is 8888)"),
                                  &port),
     GNUNET_GETOPT_OPTION_END
   };
@@ -523,8 +523,8 @@ main (int argc, char *const *argv)
                              options,
                              &run,
                              NULL))
-        ? 0
-        : 1;
+    ? 0
+    : 1;
   GNUNET_free_nz ((void *) argv);
   return ret;
 }
-- 
cgit v1.2.3