diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-06-09 11:49:32 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-06-09 11:49:32 +0200 |
commit | a87029a6329308df9796b617248ea944f388ea88 (patch) | |
tree | 06d0fd55c2867178de7a71289d6e6fb430ff60a6 | |
parent | 349b4e37123368e3f03d563770d72bcbfd8109ad (diff) | |
download | gnunet-a87029a6329308df9796b617248ea944f388ea88.tar.gz gnunet-a87029a6329308df9796b617248ea944f388ea88.zip |
RECLAIM: Improve OIDC plugin; now requires jose (new optional dependency)
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 8 |
3 files changed, 9 insertions, 4 deletions
@@ -147,7 +147,8 @@ Dependencies of optional components/functionality: | |||
147 | - PABC credential support | 147 | - PABC credential support |
148 | * libpabc any (for re:claimID zero-knowledge privacy | 148 | * libpabc any (for re:claimID zero-knowledge privacy |
149 | credentials) | 149 | credentials) |
150 | 150 | - re:claimID OpenID Connect plugin | |
151 | * libjose any (for re:claimID OpenID Connect support) | ||
151 | 152 | ||
152 | 153 | ||
153 | Additional dependencies to run the GNUnet testsuite: | 154 | Additional dependencies to run the GNUnet testsuite: |
diff --git a/configure.ac b/configure.ac index 3553d93b9..c34e2a70e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -722,7 +722,7 @@ AS_IF([test "x$jansson" = "x0"], | |||
722 | # check for jose | 722 | # check for jose |
723 | CHECK_WITH_LIB([jose], [jose_jwk_gen], [jose/jose.h], [HAVE_JOSE]) | 723 | CHECK_WITH_LIB([jose], [jose_jwk_gen], [jose/jose.h], [HAVE_JOSE]) |
724 | AS_IF([test "x$jose" = "x0"], | 724 | AS_IF([test "x$jose" = "x0"], |
725 | [AC_MSG_ERROR([GNUnet requires jose])]) | 725 | [AC_MSG_WARN([reclaimID OpenID Connect plugin requires jose])]) |
726 | 726 | ||
727 | # check for libpulse (pulseaudio) | 727 | # check for libpulse (pulseaudio) |
728 | CHECK_WITH_LIB([pulse], [pa_stream_peek], [pulse/simple.h], [HAVE_PULSE]) | 728 | CHECK_WITH_LIB([pulse], [pa_stream_peek], [pulse/simple.h], [HAVE_PULSE]) |
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 710207d8b..2f3df3456 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -10,9 +10,12 @@ endif | |||
10 | 10 | ||
11 | 11 | ||
12 | REST_PLUGIN = \ | 12 | REST_PLUGIN = \ |
13 | libgnunet_plugin_rest_openid_connect.la \ | ||
14 | libgnunet_plugin_rest_reclaim.la | 13 | libgnunet_plugin_rest_reclaim.la |
15 | 14 | ||
15 | if HAVE_JOSE | ||
16 | REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la | ||
17 | endif | ||
18 | |||
16 | CREDENTIAL_PLUGIN = \ | 19 | CREDENTIAL_PLUGIN = \ |
17 | libgnunet_plugin_reclaim_credential_jwt.la | 20 | libgnunet_plugin_reclaim_credential_jwt.la |
18 | 21 | ||
@@ -66,7 +69,7 @@ libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ | |||
66 | $(GN_PLUGIN_LDFLAGS) | 69 | $(GN_PLUGIN_LDFLAGS) |
67 | libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | 70 | libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) |
68 | 71 | ||
69 | 72 | if HAVE_JOSE | |
70 | libgnunet_plugin_rest_openid_connect_la_SOURCES = \ | 73 | libgnunet_plugin_rest_openid_connect_la_SOURCES = \ |
71 | plugin_rest_openid_connect.c \ | 74 | plugin_rest_openid_connect.c \ |
72 | oidc_helper.h \ | 75 | oidc_helper.h \ |
@@ -84,6 +87,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \ | |||
84 | libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ | 87 | libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ |
85 | $(GN_PLUGIN_LDFLAGS) | 88 | $(GN_PLUGIN_LDFLAGS) |
86 | libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | 89 | libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) |
90 | endif | ||
87 | 91 | ||
88 | if HAVE_PABC | 92 | if HAVE_PABC |
89 | libgnunet_plugin_rest_pabc_la_SOURCES = \ | 93 | libgnunet_plugin_rest_pabc_la_SOURCES = \ |