aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-07-23 22:58:20 +0200
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>2018-07-23 22:58:20 +0200
commit4336c9fddab44104eef6a480f354a92b6befa255 (patch)
treed6dd63423ed2667e4cce9c8d8b55d0acf57bd64c
parent94c9fde8f4136432bb4cbc99ba5102702279df14 (diff)
downloadgnunet-4336c9fddab44104eef6a480f354a92b6befa255.tar.gz
gnunet-4336c9fddab44104eef6a480f354a92b6befa255.zip
fix wrong record type
-rw-r--r--src/reclaim/plugin_gnsrecord_reclaim.c8
-rw-r--r--src/reclaim/plugin_rest_openid_connect.c6
2 files changed, 8 insertions, 6 deletions
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c
index 181a4bbc2..ecd1d6e77 100644
--- a/src/reclaim/plugin_gnsrecord_reclaim.c
+++ b/src/reclaim/plugin_gnsrecord_reclaim.c
@@ -54,11 +54,11 @@ value_to_string (void *cls,
54 case GNUNET_GNSRECORD_TYPE_ID_ATTR: 54 case GNUNET_GNSRECORD_TYPE_ID_ATTR:
55 return GNUNET_STRINGS_data_to_string_alloc (data, data_size); 55 return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
56 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: //DEPRECATED 56 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: //DEPRECATED
57 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
58 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
57 return GNUNET_strndup (data, data_size); 59 return GNUNET_strndup (data, data_size);
58 case GNUNET_GNSRECORD_TYPE_ABE_KEY: 60 case GNUNET_GNSRECORD_TYPE_ABE_KEY:
59 case GNUNET_GNSRECORD_TYPE_ABE_MASTER: 61 case GNUNET_GNSRECORD_TYPE_ABE_MASTER:
60 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
61 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
62 return GNUNET_STRINGS_data_to_string_alloc (data, data_size); 62 return GNUNET_STRINGS_data_to_string_alloc (data, data_size);
63 case GNUNET_GNSRECORD_TYPE_ID_TOKEN_METADATA: //DEPRECATED 63 case GNUNET_GNSRECORD_TYPE_ID_TOKEN_METADATA: //DEPRECATED
64 ecdhe_privkey = data; 64 ecdhe_privkey = data;
@@ -115,13 +115,13 @@ string_to_value (void *cls,
115 *data, 115 *data,
116 *data_size); 116 *data_size);
117 case GNUNET_GNSRECORD_TYPE_ID_TOKEN: 117 case GNUNET_GNSRECORD_TYPE_ID_TOKEN:
118 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
119 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
118 *data = GNUNET_strdup (s); 120 *data = GNUNET_strdup (s);
119 *data_size = strlen (s); 121 *data_size = strlen (s);
120 return GNUNET_OK; 122 return GNUNET_OK;
121 case GNUNET_GNSRECORD_TYPE_ABE_KEY: 123 case GNUNET_GNSRECORD_TYPE_ABE_KEY:
122 case GNUNET_GNSRECORD_TYPE_ABE_MASTER: 124 case GNUNET_GNSRECORD_TYPE_ABE_MASTER:
123 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_CLIENT:
124 case GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT:
125 return GNUNET_STRINGS_string_to_data (s, 125 return GNUNET_STRINGS_string_to_data (s,
126 strlen (s), 126 strlen (s),
127 *data, 127 *data,
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index 99459427c..24673c692 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -895,10 +895,12 @@ lookup_redirect_uri_result (void *cls,
895 } 895 }
896 for (int i = 0; i < rd_count; i++) 896 for (int i = 0; i < rd_count; i++)
897 { 897 {
898 if (0 != strcmp (rd[0].data, 898 if (GNUNET_GNSRECORD_TYPE_RECLAIM_OIDC_REDIRECT != rd[i].record_type)
899 continue;
900 if (0 != strcmp (rd[i].data,
899 handle->oidc->redirect_uri)) 901 handle->oidc->redirect_uri))
900 continue; 902 continue;
901 tmp = GNUNET_strdup (rd[0].data); 903 tmp = GNUNET_strdup (rd[i].data);
902 pos = strrchr (tmp, 904 pos = strrchr (tmp,
903 (unsigned char) '.'); 905 (unsigned char) '.');
904 *pos = '\0'; 906 *pos = '\0';