[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/03: BUILD: Move reclaim to service
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/03: BUILD: Move reclaim to service |
|
Date: |
Thu, 19 Oct 2023 12:53:50 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 39e327905f421c470b9cbd5c1ea548261bcae026
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 12:49:08 2023 +0200
BUILD: Move reclaim to service
---
configure.ac | 5 +-
po/POTFILES.in | 40 ++--
src/Makefile.am | 1 -
src/cli/Makefile.am | 3 +-
src/cli/reclaim/.gitignore | 2 +
src/cli/reclaim/Makefile.am | 55 +++++
src/{ => cli}/reclaim/gnunet-did.c | 1 -
src/{ => cli}/reclaim/gnunet-reclaim.c | 0
src/{ => cli}/reclaim/test_reclaim.sh | 0
src/{ => cli}/reclaim/test_reclaim_attribute.sh | 0
src/{ => cli}/reclaim/test_reclaim_consume.sh | 0
src/{ => cli}/reclaim/test_reclaim_issue.sh | 0
src/{ => cli}/reclaim/test_reclaim_revoke.sh | 0
src/plugin/Makefile.am | 3 +-
src/plugin/reclaim/Makefile.am | 70 ++++++
.../reclaim/plugin_gnsrecord_reclaim.c | 0
.../reclaim/plugin_reclaim_attribute_basic.c | 0
.../reclaim/plugin_reclaim_credential_jwt.c | 0
.../reclaim/plugin_reclaim_credential_pabc.c | 0
src/reclaim/Makefile.am | 252 ---------------------
src/rest-plugin/Makefile.am | 3 +-
src/rest-plugin/reclaim/Makefile.am | 81 +++++++
src/{ => rest-plugin}/reclaim/json_reclaim.c | 0
src/{ => rest-plugin}/reclaim/json_reclaim.h | 0
src/{ => rest-plugin}/reclaim/oidc_helper.c | 0
src/{ => rest-plugin}/reclaim/oidc_helper.h | 0
.../reclaim/plugin_rest_openid_connect.c | 0
src/{ => rest-plugin}/reclaim/plugin_rest_pabc.c | 0
.../reclaim/plugin_rest_reclaim.c | 0
src/service/Makefile.am | 3 +-
src/{ => service}/reclaim/.gitignore | 0
src/service/reclaim/Makefile.am | 104 +++++++++
src/{ => service}/reclaim/did.h | 0
src/{ => service}/reclaim/did_core.c | 0
src/{ => service}/reclaim/did_core.h | 0
src/{ => service}/reclaim/did_helper.c | 0
src/{ => service}/reclaim/did_helper.h | 0
src/{ => service}/reclaim/did_misc.c | 0
src/{ => service}/reclaim/gnunet-service-reclaim.c | 0
.../reclaim/gnunet-service-reclaim_tickets.c | 0
.../reclaim/gnunet-service-reclaim_tickets.h | 0
src/{ => service}/reclaim/meson.build | 0
src/{ => service}/reclaim/pabc_helper.c | 0
src/{ => service}/reclaim/pabc_helper.h | 0
src/{ => service}/reclaim/reclaim.conf | 0
src/{ => service}/reclaim/reclaim.h | 0
src/{ => service}/reclaim/reclaim_api.c | 0
src/{ => service}/reclaim/reclaim_attribute.c | 0
src/{ => service}/reclaim/reclaim_attribute.h | 0
src/{ => service}/reclaim/reclaim_credential.c | 0
src/{ => service}/reclaim/reclaim_credential.h | 0
src/{ => service}/reclaim/test_did_helper.c | 0
src/{ => service}/reclaim/test_reclaim.conf | 0
src/{ => service}/reclaim/test_reclaim_attribute.c | 0
.../reclaim/test_reclaim_defaults.conf | 0
src/{ => service}/reclaim/test_w3c_ed25519_2020.c | 0
56 files changed, 344 insertions(+), 279 deletions(-)
diff --git a/configure.ac b/configure.ac
index a792b0290..62179b93a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1245,6 +1245,7 @@ src/plugin/gns/Makefile
src/plugin/gnsrecord/Makefile
src/plugin/namecache/Makefile
src/plugin/namestore/Makefile
+src/plugin/reclaim/Makefile
src/plugin/revocation/Makefile
src/service/Makefile
src/service/arm/Makefile
@@ -1282,6 +1283,7 @@ src/service/nse/nse.conf
src/service/peerstore/Makefile
src/service/peerstore/peerstore.conf
src/service/pt/Makefile
+src/service/reclaim/Makefile
src/service/regex/Makefile
src/service/regex/regex.conf
src/service/rest/Makefile
@@ -1305,6 +1307,7 @@ src/service/zonemaster/zonemaster.conf
src/rest-plugin/Makefile
src/rest-plugin/gns/Makefile
src/rest-plugin/identity/Makefile
+src/rest-plugin/reclaim/Makefile
src/rest-plugin/rest/Makefile
src/cli/Makefile
src/cli/arm/Makefile
@@ -1319,6 +1322,7 @@ src/cli/namestore/Makefile
src/cli/nat/Makefile
src/cli/nat-auto/Makefile
src/cli/nse/Makefile
+src/cli/reclaim/Makefile
src/cli/revocation/Makefile
src/cli/statistics/Makefile
src/cli/util/Makefile
@@ -1345,7 +1349,6 @@ src/contrib/cli/template/Makefile
src/lib/hello/Makefile
src/include/Makefile
src/include/gnunet_config.h
-src/reclaim/Makefile
src/messenger/Makefile
src/messenger/messenger.conf
pkgconfig/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e96e599d..dda139f3e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,8 @@ src/cli/nat-auto/gnunet-nat-auto.c
src/cli/nat-auto/gnunet-nat-server.c
src/cli/nat/gnunet-nat.c
src/cli/nse/gnunet-nse.c
+src/cli/reclaim/gnunet-did.c
+src/cli/reclaim/gnunet-reclaim.c
src/cli/revocation/gnunet-revocation-tvg.c
src/cli/revocation/gnunet-revocation.c
src/cli/statistics/gnunet-statistics.c
@@ -250,29 +252,16 @@ src/plugin/namestore/plugin_namestore_flat.c
src/plugin/namestore/plugin_namestore_postgres.c
src/plugin/namestore/plugin_namestore_sqlite.c
src/plugin/namestore/plugin_rest_namestore.c
+src/plugin/reclaim/plugin_gnsrecord_reclaim.c
+src/plugin/reclaim/plugin_reclaim_attribute_basic.c
+src/plugin/reclaim/plugin_reclaim_credential_jwt.c
+src/plugin/reclaim/plugin_reclaim_credential_pabc.c
src/plugin/revocation/plugin_block_revocation.c
-src/reclaim/did_core.c
-src/reclaim/did_helper.c
-src/reclaim/did_misc.c
-src/reclaim/gnunet-did.c
-src/reclaim/gnunet-reclaim.c
-src/reclaim/gnunet-service-reclaim.c
-src/reclaim/gnunet-service-reclaim_tickets.c
-src/reclaim/json_reclaim.c
-src/reclaim/oidc_helper.c
-src/reclaim/pabc_helper.c
-src/reclaim/plugin_gnsrecord_reclaim.c
-src/reclaim/plugin_reclaim_attribute_basic.c
-src/reclaim/plugin_reclaim_credential_jwt.c
-src/reclaim/plugin_reclaim_credential_pabc.c
-src/reclaim/plugin_rest_openid_connect.c
-src/reclaim/plugin_rest_pabc.c
-src/reclaim/plugin_rest_reclaim.c
-src/reclaim/reclaim_api.c
-src/reclaim/reclaim_attribute.c
-src/reclaim/reclaim_credential.c
src/rest-plugin/gns/plugin_rest_gns.c
src/rest-plugin/identity/plugin_rest_identity.c
+src/rest-plugin/reclaim/plugin_rest_openid_connect.c
+src/rest-plugin/reclaim/plugin_rest_pabc.c
+src/rest-plugin/reclaim/plugin_rest_reclaim.c
src/rest-plugin/rest/plugin_rest_config.c
src/rest-plugin/rest/plugin_rest_copying.c
src/service/arm/arm_api.c
@@ -413,6 +402,17 @@ src/service/peerstore/peerstore_common.c
src/service/peerstore/plugin_peerstore_flat.c
src/service/peerstore/plugin_peerstore_sqlite.c
src/service/pt/gnunet-daemon-pt.c
+src/service/reclaim/did_core.c
+src/service/reclaim/did_helper.c
+src/service/reclaim/did_misc.c
+src/service/reclaim/gnunet-service-reclaim.c
+src/service/reclaim/gnunet-service-reclaim_tickets.c
+src/service/reclaim/json_reclaim.c
+src/service/reclaim/oidc_helper.c
+src/service/reclaim/pabc_helper.c
+src/service/reclaim/reclaim_api.c
+src/service/reclaim/reclaim_attribute.c
+src/service/reclaim/reclaim_credential.c
src/service/regex/gnunet-daemon-regexprofiler.c
src/service/regex/gnunet-regex-profiler.c
src/service/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b30ae47f6..081b83190 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,5 +10,4 @@ SUBDIRS = \
rest-plugin \
cli \
contrib \
- reclaim \
messenger
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 950aab622..9b30c22ae 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -14,4 +14,5 @@ SUBDIRS = \
vpn \
gns \
fs \
- cadet
+ cadet \
+ reclaim
diff --git a/src/cli/reclaim/.gitignore b/src/cli/reclaim/.gitignore
new file mode 100644
index 000000000..49e84eb66
--- /dev/null
+++ b/src/cli/reclaim/.gitignore
@@ -0,0 +1,2 @@
+gnunet-reclaim
+gnunet-did
diff --git a/src/cli/reclaim/Makefile.am b/src/cli/reclaim/Makefile.am
new file mode 100644
index 000000000..1a9273f6b
--- /dev/null
+++ b/src/cli/reclaim/Makefile.am
@@ -0,0 +1,55 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+EXTRA_DIST = \
+ $(check_SCRIPTS)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-reclaim \
+ gnunet-did
+
+gnunet_reclaim_SOURCES = \
+ gnunet-reclaim.c
+gnunet_reclaim_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(GN_LIBINTL)
+
+gnunet_did_SOURCES = \
+ gnunet-did.c
+gnunet_did_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/reclaim/libgnunetdid.la \
+ -ljansson
+gnunet_did_CFLAGS = \
+ -I$(top_builddir)/src/service/reclaim
+
+check_SCRIPTS = \
+ test_reclaim_attribute.sh \
+ test_reclaim_issue.sh \
+ test_reclaim_consume.sh
+
+if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
diff --git a/src/reclaim/gnunet-did.c b/src/cli/reclaim/gnunet-did.c
similarity index 99%
rename from src/reclaim/gnunet-did.c
rename to src/cli/reclaim/gnunet-did.c
index e88a3671e..33f6c5657 100644
--- a/src/reclaim/gnunet-did.c
+++ b/src/cli/reclaim/gnunet-did.c
@@ -39,7 +39,6 @@
#include "gnunet_identity_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_gnsrecord_lib.h"
-#include "did_helper.h"
#include "did_core.h"
#include "jansson.h"
diff --git a/src/reclaim/gnunet-reclaim.c b/src/cli/reclaim/gnunet-reclaim.c
similarity index 100%
rename from src/reclaim/gnunet-reclaim.c
rename to src/cli/reclaim/gnunet-reclaim.c
diff --git a/src/reclaim/test_reclaim.sh b/src/cli/reclaim/test_reclaim.sh
similarity index 100%
rename from src/reclaim/test_reclaim.sh
rename to src/cli/reclaim/test_reclaim.sh
diff --git a/src/reclaim/test_reclaim_attribute.sh
b/src/cli/reclaim/test_reclaim_attribute.sh
similarity index 100%
rename from src/reclaim/test_reclaim_attribute.sh
rename to src/cli/reclaim/test_reclaim_attribute.sh
diff --git a/src/reclaim/test_reclaim_consume.sh
b/src/cli/reclaim/test_reclaim_consume.sh
similarity index 100%
rename from src/reclaim/test_reclaim_consume.sh
rename to src/cli/reclaim/test_reclaim_consume.sh
diff --git a/src/reclaim/test_reclaim_issue.sh
b/src/cli/reclaim/test_reclaim_issue.sh
similarity index 100%
rename from src/reclaim/test_reclaim_issue.sh
rename to src/cli/reclaim/test_reclaim_issue.sh
diff --git a/src/reclaim/test_reclaim_revoke.sh
b/src/cli/reclaim/test_reclaim_revoke.sh
similarity index 100%
rename from src/reclaim/test_reclaim_revoke.sh
rename to src/cli/reclaim/test_reclaim_revoke.sh
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 574c57639..1a1ecffa7 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -6,4 +6,5 @@ SUBDIRS = \
namestore \
revocation \
gns \
- fs
+ fs \
+ reclaim
diff --git a/src/plugin/reclaim/Makefile.am b/src/plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..0b5159c6b
--- /dev/null
+++ b/src/plugin/reclaim/Makefile.am
@@ -0,0 +1,70 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+CREDENTIAL_PLUGIN = \
+ libgnunet_plugin_reclaim_credential_jwt.la
+
+if HAVE_PABC
+ CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
+endif
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_gnsrecord_reclaim.la \
+ libgnunet_plugin_reclaim_attribute_basic.la \
+ $(CREDENTIAL_PLUGIN)
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
+ plugin_gnsrecord_reclaim.c
+libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
+ plugin_reclaim_attribute_basic.c
+libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+if HAVE_PABC
+libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
+ plugin_reclaim_credential_pabc.c \
+ pabc_helper.c \
+ pabc_helper.h
+libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ -ljansson\
+ -lpabc \
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+
+libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
+ plugin_reclaim_credential_jwt.c
+libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ -ljansson\
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c
b/src/plugin/reclaim/plugin_gnsrecord_reclaim.c
similarity index 100%
rename from src/reclaim/plugin_gnsrecord_reclaim.c
rename to src/plugin/reclaim/plugin_gnsrecord_reclaim.c
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c
b/src/plugin/reclaim/plugin_reclaim_attribute_basic.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_attribute_basic.c
rename to src/plugin/reclaim/plugin_reclaim_attribute_basic.c
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c
b/src/plugin/reclaim/plugin_reclaim_credential_jwt.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_credential_jwt.c
rename to src/plugin/reclaim/plugin_reclaim_credential_jwt.c
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c
b/src/plugin/reclaim/plugin_reclaim_credential_pabc.c
similarity index 100%
rename from src/reclaim/plugin_reclaim_credential_pabc.c
rename to src/plugin/reclaim/plugin_reclaim_credential_pabc.c
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
deleted file mode 100644
index e5603d662..000000000
--- a/src/reclaim/Makefile.am
+++ /dev/null
@@ -1,252 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
- AM_CFLAGS = --coverage -O0
- XLIB = -lgcov
-endif
-
-
-REST_PLUGIN = \
- libgnunet_plugin_rest_reclaim.la
-
-if HAVE_JOSE
-REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
-endif
-
-CREDENTIAL_PLUGIN = \
- libgnunet_plugin_reclaim_credential_jwt.la
-
-if HAVE_PABC
- CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
- REST_PLUGIN += libgnunet_plugin_rest_pabc.la
-endif
-
-EXTRA_DIST = \
- reclaim.conf \
- test_reclaim_defaults.conf \
- test_reclaim.conf \
- $(check_SCRIPTS)
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
- reclaim.conf
-
-lib_LTLIBRARIES = \
- libgnunetreclaim.la \
- libgnunetdid.la
-plugin_LTLIBRARIES = \
- libgnunet_plugin_gnsrecord_reclaim.la \
- libgnunet_plugin_reclaim_attribute_basic.la \
- $(CREDENTIAL_PLUGIN) \
- $(REST_PLUGIN)
-
-bin_PROGRAMS = \
- gnunet-reclaim \
- gnunet-did
-
-libexec_PROGRAMS = \
- gnunet-service-reclaim
-
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
- plugin_rest_reclaim.c \
- json_reclaim.h \
- json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/lib/json/libgnunetjson.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-if HAVE_JOSE
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
- plugin_rest_openid_connect.c \
- oidc_helper.h \
- oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
- $(LIBGCRYPT_LIBS)
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-if HAVE_PABC
-libgnunet_plugin_rest_pabc_la_SOURCES = \
- plugin_rest_pabc.c \
- pabc_helper.c
-libgnunet_plugin_rest_pabc_la_LIBADD = \
- libgnunetreclaim.la \
- $(top_builddir)/src/lib/json/libgnunetjson.la \
- $(top_builddir)/src/service/rest/libgnunetrest.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
-libgnunet_plugin_rest_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-
-libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
- plugin_gnsrecord_reclaim.c
-libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_service_reclaim_SOURCES = \
- gnunet-service-reclaim.c \
- gnunet-service-reclaim_tickets.c \
- gnunet-service-reclaim_tickets.h
-gnunet_service_reclaim_LDADD = \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(GN_LIBINTL)
-
-libgnunetreclaim_la_SOURCES = \
- reclaim_api.c \
- reclaim.h \
- reclaim_attribute.c \
- reclaim_attribute.h \
- reclaim_credential.c \
- reclaim_credential.h
-libgnunetreclaim_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(GN_LIBINTL) $(XLIB)
-libgnunetreclaim_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunetdid_la_SOURCES = \
- did_helper.c \
- did_helper.h \
- did_core.h \
- did_core.c
-libgnunetdid_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- -ljansson \
- $(GN_LIBINTL) $(XLIB)
-libgnunetdid_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
- plugin_reclaim_attribute_basic.c
-libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_PABC
-libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
- plugin_reclaim_credential_pabc.c \
- pabc_helper.c \
- pabc_helper.h
-libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- -ljansson\
- -lpabc \
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-
-libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
- plugin_reclaim_credential_jwt.c
-libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- -ljansson\
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-gnunet_reclaim_SOURCES = \
- gnunet-reclaim.c
-gnunet_reclaim_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(GN_LIBINTL)
-
-test_reclaim_attribute_SOURCES = \
- test_reclaim_attribute.c
-test_reclaim_attribute_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunetreclaim.la \
- $(GN_LIBINTL)
-
-gnunet_did_SOURCES = \
- gnunet-did.c
-gnunet_did_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetdid.la \
- -ljansson
-
-
-test_did_helper_SOURCES = \
- test_did_helper.c
-test_did_helper_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- libgnunetdid.la \
- -ljansson
-
-check_SCRIPTS = \
- test_reclaim_attribute.sh \
- test_reclaim_issue.sh \
- test_reclaim_consume.sh
-
-check_PROGRAMS = \
- test_reclaim_attribute \
- test_did_helper
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
- TESTS = \
- $(check_SCRIPTS) \
- $(check_PROGRAMS)
-endif
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
index 4b1b71bb7..d76972b78 100644
--- a/src/rest-plugin/Makefile.am
+++ b/src/rest-plugin/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
rest \
identity \
- gns
+ gns \
+ reclaim
diff --git a/src/rest-plugin/reclaim/Makefile.am
b/src/rest-plugin/reclaim/Makefile.am
new file mode 100644
index 000000000..76ca198ab
--- /dev/null
+++ b/src/rest-plugin/reclaim/Makefile.am
@@ -0,0 +1,81 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+REST_PLUGIN = \
+ libgnunet_plugin_rest_reclaim.la
+
+if HAVE_JOSE
+REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
+endif
+
+if HAVE_PABC
+ REST_PLUGIN += libgnunet_plugin_rest_pabc.la
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+ $(REST_PLUGIN)
+
+libgnunet_plugin_rest_reclaim_la_SOURCES = \
+ plugin_rest_reclaim.c \
+ json_reclaim.h \
+ json_reclaim.c
+libgnunet_plugin_rest_reclaim_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/lib/json/libgnunetjson.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_reclaim_la_CFLAGS = \
+ $(MHD_CFLAGS) $(AM_CFLAGS)
+
+if HAVE_JOSE
+libgnunet_plugin_rest_openid_connect_la_SOURCES = \
+ plugin_rest_openid_connect.c \
+ oidc_helper.h \
+ oidc_helper.c
+libgnunet_plugin_rest_openid_connect_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
+ $(LIBGCRYPT_LIBS)
+libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+endif
+
+if HAVE_PABC
+libgnunet_plugin_rest_pabc_la_SOURCES = \
+ plugin_rest_pabc.c \
+ pabc_helper.c
+libgnunet_plugin_rest_pabc_la_LIBADD = \
+ $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+ $(top_builddir)/src/lib/json/libgnunetjson.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
+libgnunet_plugin_rest_pabc_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+endif
diff --git a/src/reclaim/json_reclaim.c b/src/rest-plugin/reclaim/json_reclaim.c
similarity index 100%
rename from src/reclaim/json_reclaim.c
rename to src/rest-plugin/reclaim/json_reclaim.c
diff --git a/src/reclaim/json_reclaim.h b/src/rest-plugin/reclaim/json_reclaim.h
similarity index 100%
rename from src/reclaim/json_reclaim.h
rename to src/rest-plugin/reclaim/json_reclaim.h
diff --git a/src/reclaim/oidc_helper.c b/src/rest-plugin/reclaim/oidc_helper.c
similarity index 100%
rename from src/reclaim/oidc_helper.c
rename to src/rest-plugin/reclaim/oidc_helper.c
diff --git a/src/reclaim/oidc_helper.h b/src/rest-plugin/reclaim/oidc_helper.h
similarity index 100%
rename from src/reclaim/oidc_helper.h
rename to src/rest-plugin/reclaim/oidc_helper.h
diff --git a/src/reclaim/plugin_rest_openid_connect.c
b/src/rest-plugin/reclaim/plugin_rest_openid_connect.c
similarity index 100%
rename from src/reclaim/plugin_rest_openid_connect.c
rename to src/rest-plugin/reclaim/plugin_rest_openid_connect.c
diff --git a/src/reclaim/plugin_rest_pabc.c
b/src/rest-plugin/reclaim/plugin_rest_pabc.c
similarity index 100%
rename from src/reclaim/plugin_rest_pabc.c
rename to src/rest-plugin/reclaim/plugin_rest_pabc.c
diff --git a/src/reclaim/plugin_rest_reclaim.c
b/src/rest-plugin/reclaim/plugin_rest_reclaim.c
similarity index 100%
rename from src/reclaim/plugin_rest_reclaim.c
rename to src/rest-plugin/reclaim/plugin_rest_reclaim.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 9b39208de..2eee658f8 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -29,5 +29,6 @@ SUBDIRS = \
zonemaster \
fs \
exit \
- pt
+ pt \
+ reclaim
diff --git a/src/reclaim/.gitignore b/src/service/reclaim/.gitignore
similarity index 100%
rename from src/reclaim/.gitignore
rename to src/service/reclaim/.gitignore
diff --git a/src/service/reclaim/Makefile.am b/src/service/reclaim/Makefile.am
new file mode 100644
index 000000000..56b9e96e1
--- /dev/null
+++ b/src/service/reclaim/Makefile.am
@@ -0,0 +1,104 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+ plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+
+EXTRA_DIST = \
+ reclaim.conf \
+ test_reclaim_defaults.conf \
+ test_reclaim.conf
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+ reclaim.conf
+
+lib_LTLIBRARIES = \
+ libgnunetreclaim.la \
+ libgnunetdid.la
+
+libexec_PROGRAMS = \
+ gnunet-service-reclaim
+
+gnunet_service_reclaim_SOURCES = \
+ gnunet-service-reclaim.c \
+ gnunet-service-reclaim_tickets.c \
+ gnunet-service-reclaim_tickets.h
+gnunet_service_reclaim_LDADD = \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ libgnunetreclaim.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(GN_LIBINTL)
+
+libgnunetreclaim_la_SOURCES = \
+ reclaim_api.c \
+ reclaim.h \
+ reclaim_attribute.c \
+ reclaim_attribute.h \
+ reclaim_credential.c \
+ reclaim_credential.h
+libgnunetreclaim_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(GN_LIBINTL) $(XLIB)
+libgnunetreclaim_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+libgnunetdid_la_SOURCES = \
+ did_helper.c \
+ did_helper.h \
+ did_core.h \
+ did_core.c
+libgnunetdid_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ -ljansson \
+ $(GN_LIBINTL) $(XLIB)
+libgnunetdid_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+test_reclaim_attribute_SOURCES = \
+ test_reclaim_attribute.c
+test_reclaim_attribute_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ libgnunetreclaim.la \
+ $(GN_LIBINTL)
+
+test_did_helper_SOURCES = \
+ test_did_helper.c
+test_did_helper_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+ libgnunetdid.la \
+ -ljansson
+
+check_PROGRAMS = \
+ test_reclaim_attribute \
+ test_did_helper
+
+if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
diff --git a/src/reclaim/did.h b/src/service/reclaim/did.h
similarity index 100%
rename from src/reclaim/did.h
rename to src/service/reclaim/did.h
diff --git a/src/reclaim/did_core.c b/src/service/reclaim/did_core.c
similarity index 100%
rename from src/reclaim/did_core.c
rename to src/service/reclaim/did_core.c
diff --git a/src/reclaim/did_core.h b/src/service/reclaim/did_core.h
similarity index 100%
rename from src/reclaim/did_core.h
rename to src/service/reclaim/did_core.h
diff --git a/src/reclaim/did_helper.c b/src/service/reclaim/did_helper.c
similarity index 100%
rename from src/reclaim/did_helper.c
rename to src/service/reclaim/did_helper.c
diff --git a/src/reclaim/did_helper.h b/src/service/reclaim/did_helper.h
similarity index 100%
rename from src/reclaim/did_helper.h
rename to src/service/reclaim/did_helper.h
diff --git a/src/reclaim/did_misc.c b/src/service/reclaim/did_misc.c
similarity index 100%
rename from src/reclaim/did_misc.c
rename to src/service/reclaim/did_misc.c
diff --git a/src/reclaim/gnunet-service-reclaim.c
b/src/service/reclaim/gnunet-service-reclaim.c
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim.c
rename to src/service/reclaim/gnunet-service-reclaim.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c
b/src/service/reclaim/gnunet-service-reclaim_tickets.c
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim_tickets.c
rename to src/service/reclaim/gnunet-service-reclaim_tickets.c
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h
b/src/service/reclaim/gnunet-service-reclaim_tickets.h
similarity index 100%
rename from src/reclaim/gnunet-service-reclaim_tickets.h
rename to src/service/reclaim/gnunet-service-reclaim_tickets.h
diff --git a/src/reclaim/meson.build b/src/service/reclaim/meson.build
similarity index 100%
rename from src/reclaim/meson.build
rename to src/service/reclaim/meson.build
diff --git a/src/reclaim/pabc_helper.c b/src/service/reclaim/pabc_helper.c
similarity index 100%
rename from src/reclaim/pabc_helper.c
rename to src/service/reclaim/pabc_helper.c
diff --git a/src/reclaim/pabc_helper.h b/src/service/reclaim/pabc_helper.h
similarity index 100%
rename from src/reclaim/pabc_helper.h
rename to src/service/reclaim/pabc_helper.h
diff --git a/src/reclaim/reclaim.conf b/src/service/reclaim/reclaim.conf
similarity index 100%
rename from src/reclaim/reclaim.conf
rename to src/service/reclaim/reclaim.conf
diff --git a/src/reclaim/reclaim.h b/src/service/reclaim/reclaim.h
similarity index 100%
rename from src/reclaim/reclaim.h
rename to src/service/reclaim/reclaim.h
diff --git a/src/reclaim/reclaim_api.c b/src/service/reclaim/reclaim_api.c
similarity index 100%
rename from src/reclaim/reclaim_api.c
rename to src/service/reclaim/reclaim_api.c
diff --git a/src/reclaim/reclaim_attribute.c
b/src/service/reclaim/reclaim_attribute.c
similarity index 100%
rename from src/reclaim/reclaim_attribute.c
rename to src/service/reclaim/reclaim_attribute.c
diff --git a/src/reclaim/reclaim_attribute.h
b/src/service/reclaim/reclaim_attribute.h
similarity index 100%
rename from src/reclaim/reclaim_attribute.h
rename to src/service/reclaim/reclaim_attribute.h
diff --git a/src/reclaim/reclaim_credential.c
b/src/service/reclaim/reclaim_credential.c
similarity index 100%
rename from src/reclaim/reclaim_credential.c
rename to src/service/reclaim/reclaim_credential.c
diff --git a/src/reclaim/reclaim_credential.h
b/src/service/reclaim/reclaim_credential.h
similarity index 100%
rename from src/reclaim/reclaim_credential.h
rename to src/service/reclaim/reclaim_credential.h
diff --git a/src/reclaim/test_did_helper.c
b/src/service/reclaim/test_did_helper.c
similarity index 100%
rename from src/reclaim/test_did_helper.c
rename to src/service/reclaim/test_did_helper.c
diff --git a/src/reclaim/test_reclaim.conf
b/src/service/reclaim/test_reclaim.conf
similarity index 100%
rename from src/reclaim/test_reclaim.conf
rename to src/service/reclaim/test_reclaim.conf
diff --git a/src/reclaim/test_reclaim_attribute.c
b/src/service/reclaim/test_reclaim_attribute.c
similarity index 100%
rename from src/reclaim/test_reclaim_attribute.c
rename to src/service/reclaim/test_reclaim_attribute.c
diff --git a/src/reclaim/test_reclaim_defaults.conf
b/src/service/reclaim/test_reclaim_defaults.conf
similarity index 100%
rename from src/reclaim/test_reclaim_defaults.conf
rename to src/service/reclaim/test_reclaim_defaults.conf
diff --git a/src/reclaim/test_w3c_ed25519_2020.c
b/src/service/reclaim/test_w3c_ed25519_2020.c
similarity index 100%
rename from src/reclaim/test_w3c_ed25519_2020.c
rename to src/service/reclaim/test_w3c_ed25519_2020.c
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.