aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2018-09-27 19:58:35 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2018-09-27 19:58:35 +0200
commit677839b3a5c414628ae1ff1da10ceb2c6aaabcb4 (patch)
tree5eac09afc59fdb7e5fa3db75ae712177f9754c97 /src
parent527a223f7c6a63d940b57e935cfdc130851da0fd (diff)
downloadgnunet-677839b3a5c414628ae1ff1da10ceb2c6aaabcb4.tar.gz
gnunet-677839b3a5c414628ae1ff1da10ceb2c6aaabcb4.zip
update
Diffstat (limited to 'src')
-rw-r--r--src/rest-plugins/Makefile.am3
-rw-r--r--src/rest-plugins/plugin_rest_openid_connect.c24
2 files changed, 0 insertions, 27 deletions
diff --git a/src/rest-plugins/Makefile.am b/src/rest-plugins/Makefile.am
index a9096b255..f119ea9b6 100644
--- a/src/rest-plugins/Makefile.am
+++ b/src/rest-plugins/Makefile.am
@@ -49,8 +49,6 @@ libgnunet_plugin_rest_credential_la_LIBADD = \
49 $(top_builddir)/src/credential/libgnunetcredential.la \ 49 $(top_builddir)/src/credential/libgnunetcredential.la \
50 $(top_builddir)/src/rest/libgnunetrest.la \ 50 $(top_builddir)/src/rest/libgnunetrest.la \
51 $(top_builddir)/src/identity/libgnunetidentity.la \ 51 $(top_builddir)/src/identity/libgnunetidentity.la \
52 $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
53 $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \
54 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ 52 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
55 $(LTLIBINTL) -ljansson -lmicrohttpd 53 $(LTLIBINTL) -ljansson -lmicrohttpd
56libgnunet_plugin_rest_credential_la_LDFLAGS = \ 54libgnunet_plugin_rest_credential_la_LDFLAGS = \
@@ -121,7 +119,6 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
121 $(top_builddir)/src/identity/libgnunetidentity.la \ 119 $(top_builddir)/src/identity/libgnunetidentity.la \
122 $(top_builddir)/src/reclaim/libgnunetreclaim.la \ 120 $(top_builddir)/src/reclaim/libgnunetreclaim.la \
123 $(top_builddir)/src/rest/libgnunetrest.la \ 121 $(top_builddir)/src/rest/libgnunetrest.la \
124 $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
125 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ 122 $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
126 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 123 $(top_builddir)/src/namestore/libgnunetnamestore.la \
127$(top_builddir)/src/gns/libgnunetgns.la \ 124$(top_builddir)/src/gns/libgnunetgns.la \
diff --git a/src/rest-plugins/plugin_rest_openid_connect.c b/src/rest-plugins/plugin_rest_openid_connect.c
index 24673c692..2bb60efce 100644
--- a/src/rest-plugins/plugin_rest_openid_connect.c
+++ b/src/rest-plugins/plugin_rest_openid_connect.c
@@ -66,22 +66,6 @@
66#define GNUNET_REST_API_NS_LOGIN "/openid/login" 66#define GNUNET_REST_API_NS_LOGIN "/openid/login"
67 67
68/** 68/**
69 * Attribute key
70 */
71#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE "attribute"
72
73/**
74 * Ticket key
75 */
76#define GNUNET_REST_JSONAPI_IDENTITY_TICKET "ticket"
77
78
79/**
80 * Value key
81 */
82#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE_VALUE "value"
83
84/**
85 * State while collecting all egos 69 * State while collecting all egos
86 */ 70 */
87#define ID_REST_STATE_INIT 0 71#define ID_REST_STATE_INIT 0
@@ -449,11 +433,6 @@ struct RequestHandle
449 */ 433 */
450 int response_code; 434 int response_code;
451 435
452 /**
453 * Response object
454 */
455 struct GNUNET_JSONAPI_Document *resp_object;
456
457}; 436};
458 437
459/** 438/**
@@ -469,8 +448,6 @@ cleanup_handle (struct RequestHandle *handle)
469 struct EgoEntry *ego_tmp; 448 struct EgoEntry *ego_tmp;
470 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 449 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
471 "Cleaning up\n"); 450 "Cleaning up\n");
472 if (NULL != handle->resp_object)
473 GNUNET_JSONAPI_document_delete (handle->resp_object);
474 if (NULL != handle->timeout_task) 451 if (NULL != handle->timeout_task)
475 GNUNET_SCHEDULER_cancel (handle->timeout_task); 452 GNUNET_SCHEDULER_cancel (handle->timeout_task);
476 if (NULL != handle->identity_handle) 453 if (NULL != handle->identity_handle)
@@ -1077,7 +1054,6 @@ login_check (void *cls)
1077 { 1054 {
1078 handle->priv_key = *GNUNET_IDENTITY_ego_get_private_key ( 1055 handle->priv_key = *GNUNET_IDENTITY_ego_get_private_key (
1079 handle->ego_entry->ego); 1056 handle->ego_entry->ego);
1080 handle->resp_object = GNUNET_JSONAPI_document_new ();
1081 handle->idp = GNUNET_RECLAIM_connect (cfg); 1057 handle->idp = GNUNET_RECLAIM_connect (cfg);
1082 handle->attr_list = GNUNET_new( 1058 handle->attr_list = GNUNET_new(
1083 struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); 1059 struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList);