[GNUnet-SVN] [gnunet] 171/171: Merge remote-tracking branch 'origin/identity_abe'

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 056ca89d207cd1865a90fe3fcd430a4381097da5
Merge: b4f6c5a8b 78705d5a4
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Jan 4 16:07:55 2018 +0100

    Merge remote-tracking branch 'origin/identity_abe'

 README                                             |    9 +-
 configure.ac                                       |   25 +
 contrib/Dockerfile                                 |   63 +
 contrib/docker-entrypoint.sh                       |    3 +
 po/POTFILES.in                                     |  134 +-
 src/Makefile.am                                    |   14 +-
 src/abe/Makefile.am                                |   50 +
 src/abe/abe.c                                      |  499 ++++
 src/abe/test_cpabe.c                               |   87 +
 src/credential/Makefile.am                         |  112 +
 src/credential/credential.conf.in                  |    5 +
 src/credential/credential.h                        |  221 ++
 src/credential/credential_api.c                    |  511 ++++
 src/credential/credential_misc.c                   |  168 ++
 src/credential/credential_misc.h                   |   35 +
 src/credential/credential_serialization.c          |  460 +++
 src/credential/credential_serialization.h          |  159 +
 src/credential/gnunet-credential.c                 |  588 ++++
 src/credential/gnunet-service-credential.c         | 1160 ++++++++
 src/credential/plugin_gnsrecord_credential.c       |  353 +++
 src/credential/plugin_rest_credential.c            | 1146 +++++++
 src/credential/test_credential_collect.sh          |   47 +
 src/credential/test_credential_collect_rest.sh     |   90 +
 src/credential/test_credential_defaults.conf       |   24 +
 src/credential/test_credential_issue.sh            |   44 +
 src/credential/test_credential_issue_rest.sh       |   53 +
 src/credential/test_credential_lookup.conf         |   28 +
 src/credential/test_credential_verify.sh           |   81 +
 src/credential/test_credential_verify_and.sh       |   81 +
 src/credential/test_credential_verify_rest.sh      |   87 +
 src/credential/test_credential_verify_simple.sh    |   50 +
 src/exit/gnunet-daemon-exit.c                      |    2 +-
 src/gns/gns_api.c                                  |   11 +-
 src/gns/plugin_gnsrecord_gns.c                     |   67 -
 src/identity-attribute/Makefile.am                 |   44 +
 src/identity-attribute/identity_attribute.c        |  421 +++
 src/identity-attribute/identity_attribute.h        |   56 +
 .../plugin_identity_attribute_gnuid.c              |  184 ++
 src/identity-provider/Makefile.am                  |   74 +-
 src/identity-provider/gnunet-identity-token.c      |  179 --
 src/identity-provider/gnunet-idp.c                 |  439 +++
 .../gnunet-service-identity-provider.c             | 3128 +++++++++++++-------
 src/identity-provider/identity-provider.conf       |    4 +
 src/identity-provider/identity_provider.h          |  307 +-
 src/identity-provider/identity_provider_api.c      | 1213 ++++++--
 src/identity-provider/identity_token.c             |  964 ------
 src/identity-provider/identity_token.h             |  346 ---
 src/identity-provider/jwt.c                        |  180 ++
 .../plugin_gnsrecord_identity_provider.c}          |   48 +-
 .../plugin_identity_provider_sqlite.c              |  736 +++++
 .../plugin_rest_identity_provider.c                | 1119 ++++---
 src/identity-provider/test_idp.conf                |   28 +
 src/identity-provider/test_idp.sh                  |   31 +
 src/identity-provider/test_idp_attribute.sh        |   40 +
 src/identity-provider/test_idp_consume.sh          |   43 +
 src/identity-provider/test_idp_defaults.conf       |   24 +
 src/identity-provider/test_idp_issue.sh            |   42 +
 src/identity-provider/test_idp_revoke.sh           |   60 +
 src/identity/Makefile.am                           |   11 +-
 src/identity/plugin_rest_identity.c                |    3 -
 src/include/gnunet_abe_lib.h                       |  193 ++
 src/include/gnunet_credential_service.h            |  297 +-
 src/include/gnunet_gnsrecord_lib.h                 |   22 +-
 src/include/gnunet_identity_attribute_lib.h        |  277 ++
 src/include/gnunet_identity_attribute_plugin.h     |  149 +
 src/include/gnunet_identity_provider_plugin.h      |  123 +
 src/include/gnunet_identity_provider_service.h     |  333 ++-
 src/include/gnunet_jsonapi_lib.h                   |    2 +-
 src/include/gnunet_protocols.h                     |   42 +-
 src/include/gnunet_rest_lib.h                      |    4 +-
 src/include/gnunet_rest_plugin.h                   |    2 +-
 src/include/gnunet_signatures.h                    |    5 +
 src/jsonapi/jsonapi_document.c                     |   32 +-
 src/jsonapi/jsonapi_resource.c                     |    6 +-
 src/namestore/plugin_rest_namestore.c              |   27 +-
 src/rest/rest.conf                                 |    1 +
 src/util/Makefile.am                               |    1 -
 src/util/crypto_abe.c                              |  416 +++
 78 files changed, 14296 insertions(+), 3827 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden