summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-07 15:51:56 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-09 20:38:11 +0100
commit5f9f9cae1714eb33e0ee9c824f3d88e6aab8cf63 (patch)
treea83fc7724ee2efbfee7d7a353b54930fb1d511b8
parent141a279fb55bc9b11aaa765ca3ad54689003e291 (diff)
consolidate reclaim attribute lib
-rw-r--r--configure.ac1
-rw-r--r--po/POTFILES.in8
-rw-r--r--src/Makefile.am1
-rw-r--r--src/include/Makefile.am2
-rw-r--r--src/include/gnunet_reclaim_lib.h (renamed from src/include/gnunet_reclaim_attribute_lib.h)0
-rw-r--r--src/include/gnunet_reclaim_plugin.h2
-rw-r--r--src/include/gnunet_reclaim_service.h2
-rw-r--r--src/reclaim-attribute/Makefile.am52
-rw-r--r--src/reclaim/Makefile.am32
-rw-r--r--src/reclaim/gnunet-service-reclaim.c2
-rw-r--r--src/reclaim/gnunet-service-reclaim_tickets.h2
-rw-r--r--src/reclaim/json_reclaim.c2
-rw-r--r--src/reclaim/json_reclaim.h2
-rw-r--r--src/reclaim/oidc_helper.c2
-rw-r--r--src/reclaim/plugin_reclaim_attestation_jwt.c (renamed from src/reclaim-attribute/plugin_reclaim_attestation_jwt.c)0
-rw-r--r--src/reclaim/plugin_reclaim_attribute_basic.c (renamed from src/reclaim-attribute/plugin_reclaim_attribute_basic.c)0
-rw-r--r--src/reclaim/plugin_rest_openid_connect.c2
-rw-r--r--src/reclaim/plugin_rest_reclaim.c2
-rw-r--r--src/reclaim/reclaim_api.c2
-rw-r--r--src/reclaim/reclaim_attestation.c (renamed from src/reclaim-attribute/reclaim_attestation.c)0
-rw-r--r--src/reclaim/reclaim_attestation.h (renamed from src/reclaim-attribute/reclaim_attestation.h)0
-rw-r--r--src/reclaim/reclaim_attribute.c (renamed from src/reclaim-attribute/reclaim_attribute.c)0
-rw-r--r--src/reclaim/reclaim_attribute.h (renamed from src/reclaim-attribute/reclaim_attribute.h)0
23 files changed, 41 insertions, 75 deletions
diff --git a/configure.ac b/configure.ac
index 23ca78dbb..c57a56f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1933,7 +1933,6 @@ src/zonemaster/Makefile
src/zonemaster/zonemaster.conf
src/rest/Makefile
src/abe/Makefile
-src/reclaim-attribute/Makefile
src/reclaim/Makefile
pkgconfig/Makefile
pkgconfig/gnunetarm.pc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3376d01b..aaeed979c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -264,19 +264,19 @@ src/pq/pq_prepare.c
src/pq/pq_query_helper.c
src/pq/pq_result_helper.c
src/pt/gnunet-daemon-pt.c
-src/reclaim-attribute/plugin_reclaim_attestation_jwt.c
-src/reclaim-attribute/plugin_reclaim_attribute_basic.c
-src/reclaim-attribute/reclaim_attestation.c
-src/reclaim-attribute/reclaim_attribute.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/plugin_gnsrecord_reclaim.c
+src/reclaim/plugin_reclaim_attestation_jwt.c
+src/reclaim/plugin_reclaim_attribute_basic.c
src/reclaim/plugin_rest_openid_connect.c
src/reclaim/plugin_rest_reclaim.c
src/reclaim/reclaim_api.c
+src/reclaim/reclaim_attestation.c
+src/reclaim/reclaim_attribute.c
src/regex/gnunet-daemon-regexprofiler.c
src/regex/gnunet-regex-profiler.c
src/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b73a4bb8..e1d73ab01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,6 @@ if HAVE_MHD
if HAVE_JSON
REST_DIR = rest
RECLAIM_DIR = \
- reclaim-attribute \
reclaim
endif
endif
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 69a493f1e..5c57b5be2 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -56,7 +56,7 @@ gnunetinclude_HEADERS = \
gnunet_helper_lib.h \
gnunet_identity_service.h \
gnunet_abe_lib.h \
- gnunet_reclaim_attribute_lib.h \
+ gnunet_reclaim_lib.h \
gnunet_reclaim_plugin.h \
gnunet_reclaim_service.h \
gnunet_json_lib.h \
diff --git a/src/include/gnunet_reclaim_attribute_lib.h b/src/include/gnunet_reclaim_lib.h
index 6d3503950..6d3503950 100644
--- a/src/include/gnunet_reclaim_attribute_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index ed62adf6c..d42ac9502 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -31,7 +31,7 @@
#define GNUNET_RECLAIM_AttributePLUGIN_H
#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#ifdef __cplusplus
extern "C" {
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index ef9899dde..c63ed0100 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -38,7 +38,7 @@ extern "C" {
#endif
#endif
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_util_lib.h"
/**
diff --git a/src/reclaim-attribute/Makefile.am b/src/reclaim-attribute/Makefile.am
deleted file mode 100644
index 9617672ee..000000000
--- a/src/reclaim-attribute/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
- AM_CFLAGS = --coverage -O0
- XLIBS = -lgcov
-endif
-
-lib_LTLIBRARIES = \
- libgnunetreclaimattribute.la
-
-libgnunetreclaimattribute_la_SOURCES = \
- reclaim_attribute.h \
- reclaim_attribute.c \
- reclaim_attestation.c
-libgnunetreclaimattribute_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
-libgnunetreclaimattribute_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-
-plugin_LTLIBRARIES = \
- libgnunet_plugin_reclaim_attribute_basic.la \
- libgnunet_plugin_reclaim_attestation_jwt.la
-
-
-libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
- plugin_reclaim_attribute_basic.c
-libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_reclaim_attestation_jwt_la_SOURCES = \
- plugin_reclaim_attestation_jwt.c
-libgnunet_plugin_reclaim_attestation_jwt_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunetreclaimattribute.la \
- -ljansson\
- $(LTLIBINTL)
-libgnunet_plugin_reclaim_attestation_jwt_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 51b9b9c5b..9242d6d79 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -34,6 +34,8 @@ lib_LTLIBRARIES = \
libgnunetreclaim.la
plugin_LTLIBRARIES = \
libgnunet_plugin_gnsrecord_reclaim.la \
+ libgnunet_plugin_reclaim_attribute_basic.la \
+ libgnunet_plugin_reclaim_attestation_jwt.la \
$(REST_PLUGIN)
bin_PROGRAMS = \
@@ -51,7 +53,6 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \
libgnunetreclaim.la \
$(top_builddir)/src/json/libgnunetjson.la \
$(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) -ljansson $(MHD_LIBS)
@@ -68,7 +69,6 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
$(top_builddir)/src/identity/libgnunetidentity.la \
libgnunetreclaim.la \
$(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
@@ -98,22 +98,43 @@ gnunet_service_reclaim_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
libgnunetreclaim.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(GN_LIBINTL)
libgnunetreclaim_la_SOURCES = \
reclaim_api.c \
- reclaim.h
+ reclaim.h \
+ reclaim_attribute.c \
+ reclaim_attribute.h \
+ reclaim_attestation.c \
+ reclaim_attestation.h
libgnunetreclaim_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
$(GN_LIBINTL) $(XLIB)
libgnunetreclaim_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/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+libgnunet_plugin_reclaim_attestation_jwt_la_SOURCES = \
+ plugin_reclaim_attestation_jwt.c
+libgnunet_plugin_reclaim_attestation_jwt_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetreclaim.la \
+ -ljansson\
+ $(LTLIBINTL)
+libgnunet_plugin_reclaim_attestation_jwt_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
gnunet_reclaim_SOURCES = \
gnunet-reclaim.c
gnunet_reclaim_LDADD = \
@@ -121,7 +142,6 @@ gnunet_reclaim_LDADD = \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
libgnunetreclaim.la \
$(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
$(GN_LIBINTL)
check_SCRIPTS = \
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 4521e5c81..ddfe05556 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -29,7 +29,7 @@
#include "gnunet_constants.h"
#include "gnunet_gnsrecord_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "gnunet_signatures.h"
#include "reclaim.h"
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h b/src/reclaim/gnunet-service-reclaim_tickets.h
index d6bc4a70a..1c7214d42 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.h
+++ b/src/reclaim/gnunet-service-reclaim_tickets.h
@@ -36,7 +36,7 @@
#include "gnunet_gns_service.h"
#include "gnunet_gnsrecord_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c
index 4c08430e7..353303187 100644
--- a/src/reclaim/json_reclaim.c
+++ b/src/reclaim/json_reclaim.c
@@ -28,7 +28,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_json_lib.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
diff --git a/src/reclaim/json_reclaim.h b/src/reclaim/json_reclaim.h
index 5aaf81b93..61ddb4378 100644
--- a/src/reclaim/json_reclaim.h
+++ b/src/reclaim/json_reclaim.h
@@ -27,7 +27,7 @@
#include "gnunet_util_lib.h"
#include "gnunet_json_lib.h"
#include "gnunet_reclaim_service.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
/**
* JSON Specification for Reclaim claims.
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index 92b4b69cc..469b8a796 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -27,7 +27,7 @@
#include <inttypes.h>
#include <jansson.h>
#include "gnunet_util_lib.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "gnunet_signatures.h"
#include "oidc_helper.h"
diff --git a/src/reclaim-attribute/plugin_reclaim_attestation_jwt.c b/src/reclaim/plugin_reclaim_attestation_jwt.c
index 8a67b18cd..8a67b18cd 100644
--- a/src/reclaim-attribute/plugin_reclaim_attestation_jwt.c
+++ b/src/reclaim/plugin_reclaim_attestation_jwt.c
diff --git a/src/reclaim-attribute/plugin_reclaim_attribute_basic.c b/src/reclaim/plugin_reclaim_attribute_basic.c
index 47fdd5f11..47fdd5f11 100644
--- a/src/reclaim-attribute/plugin_reclaim_attribute_basic.c
+++ b/src/reclaim/plugin_reclaim_attribute_basic.c
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index b296f6d15..3e138f259 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -32,7 +32,7 @@
#include "gnunet_gnsrecord_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "gnunet_rest_lib.h"
#include "gnunet_rest_plugin.h"
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index 417e594fe..8b3aee8ba 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -31,7 +31,7 @@
#include "gnunet_gns_service.h"
#include "gnunet_gnsrecord_lib.h"
#include "gnunet_identity_service.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "gnunet_rest_lib.h"
#include "gnunet_rest_plugin.h"
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index 54288866d..8558b19df 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -28,7 +28,7 @@
#include "gnunet_constants.h"
#include "gnunet_mq_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_reclaim_attribute_lib.h"
+#include "gnunet_reclaim_lib.h"
#include "gnunet_reclaim_service.h"
#include "reclaim.h"
diff --git a/src/reclaim-attribute/reclaim_attestation.c b/src/reclaim/reclaim_attestation.c
index 961c6ede4..961c6ede4 100644
--- a/src/reclaim-attribute/reclaim_attestation.c
+++ b/src/reclaim/reclaim_attestation.c
diff --git a/src/reclaim-attribute/reclaim_attestation.h b/src/reclaim/reclaim_attestation.h
index 5747d8896..5747d8896 100644
--- a/src/reclaim-attribute/reclaim_attestation.h
+++ b/src/reclaim/reclaim_attestation.h
diff --git a/src/reclaim-attribute/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
index 12f124c15..12f124c15 100644
--- a/src/reclaim-attribute/reclaim_attribute.c
+++ b/src/reclaim/reclaim_attribute.c
diff --git a/src/reclaim-attribute/reclaim_attribute.h b/src/reclaim/reclaim_attribute.h
index e54b210b9..e54b210b9 100644
--- a/src/reclaim-attribute/reclaim_attribute.h
+++ b/src/reclaim/reclaim_attribute.h