diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2017-12-04 17:48:36 +0100 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2017-12-04 17:48:36 +0100 |
commit | e4a65af290c4fd85718b8497445ca16e0719bf5e (patch) | |
tree | 6a341a9cb45e54a32ef8ca8d2a5b8936c62754af | |
parent | d4b252fd73bdda7be51a971ba06a650a1dceb45c (diff) | |
parent | 6e0922fc29b7bf481bf97c6ed269f85eadadd43e (diff) | |
download | gnunet-e4a65af290c4fd85718b8497445ca16e0719bf5e.tar.gz gnunet-e4a65af290c4fd85718b8497445ca16e0719bf5e.zip |
Merge branch 'identity_abe' into identity_oidc
-rw-r--r-- | src/identity-attribute/Makefile.am | 3 | ||||
-rw-r--r-- | src/identity-provider/Makefile.am | 3 | ||||
-rw-r--r-- | src/identity-provider/jwt.c (renamed from src/identity-attribute/jwt.c) | 2 | ||||
-rw-r--r-- | src/include/gnunet_identity_attribute_lib.h | 13 |
4 files changed, 4 insertions, 17 deletions
diff --git a/src/identity-attribute/Makefile.am b/src/identity-attribute/Makefile.am index b84ad3492..2c73a443e 100644 --- a/src/identity-attribute/Makefile.am +++ b/src/identity-attribute/Makefile.am | |||
@@ -20,8 +20,7 @@ lib_LTLIBRARIES = \ | |||
20 | libgnunetidentityattribute.la | 20 | libgnunetidentityattribute.la |
21 | 21 | ||
22 | libgnunetidentityattribute_la_SOURCES = \ | 22 | libgnunetidentityattribute_la_SOURCES = \ |
23 | identity_attribute.c \ | 23 | identity_attribute.c |
24 | jwt.c | ||
25 | libgnunetidentityattribute_la_LIBADD = \ | 24 | libgnunetidentityattribute_la_LIBADD = \ |
26 | $(top_builddir)/src/util/libgnunetutil.la \ | 25 | $(top_builddir)/src/util/libgnunetutil.la \ |
27 | $(GN_LIBINTL) | 26 | $(GN_LIBINTL) |
diff --git a/src/identity-provider/Makefile.am b/src/identity-provider/Makefile.am index 3b072e59d..5c5ddaa57 100644 --- a/src/identity-provider/Makefile.am +++ b/src/identity-provider/Makefile.am | |||
@@ -87,7 +87,8 @@ libgnunetidentityprovider_la_LDFLAGS = \ | |||
87 | -version-info 0:0:0 | 87 | -version-info 0:0:0 |
88 | 88 | ||
89 | libgnunet_plugin_rest_identity_provider_la_SOURCES = \ | 89 | libgnunet_plugin_rest_identity_provider_la_SOURCES = \ |
90 | plugin_rest_identity_provider.c | 90 | plugin_rest_identity_provider.c \ |
91 | jwt.c | ||
91 | libgnunet_plugin_rest_identity_provider_la_LIBADD = \ | 92 | libgnunet_plugin_rest_identity_provider_la_LIBADD = \ |
92 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 93 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
93 | libgnunetidentityprovider.la \ | 94 | libgnunetidentityprovider.la \ |
diff --git a/src/identity-attribute/jwt.c b/src/identity-provider/jwt.c index 935e0a79d..2f1e3240b 100644 --- a/src/identity-attribute/jwt.c +++ b/src/identity-provider/jwt.c | |||
@@ -63,7 +63,7 @@ create_jwt_header(void) | |||
63 | * @return a new base64-encoded JWT string. | 63 | * @return a new base64-encoded JWT string. |
64 | */ | 64 | */ |
65 | char* | 65 | char* |
66 | GNUNET_IDENTITY_ATTRIBUTE_jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 66 | jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, |
67 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, | 67 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, |
68 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key) | 68 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key) |
69 | { | 69 | { |
diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_identity_attribute_lib.h index 4c765515b..a6c9e1f1c 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_identity_attribute_lib.h | |||
@@ -261,19 +261,6 @@ const char* | |||
261 | GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); | 261 | GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); |
262 | 262 | ||
263 | 263 | ||
264 | /** | ||
265 | * Create a JWT from attributes | ||
266 | * | ||
267 | * @param sub_key the public of the subject | ||
268 | * @param attrs the attribute list | ||
269 | * @param priv_key the key used to sign the JWT | ||
270 | * @return a new base64-encoded JWT string. | ||
271 | */ | ||
272 | char* | ||
273 | GNUNET_IDENTITY_ATTRIBUTE_jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | ||
274 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, | ||
275 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key); | ||
276 | |||
277 | #if 0 /* keep Emacsens' auto-indent happy */ | 264 | #if 0 /* keep Emacsens' auto-indent happy */ |
278 | { | 265 | { |
279 | #endif | 266 | #endif |