[GNUnet-SVN] [gnunet] 73/75: -Merge branch 'master' into gsoc2018/rest_api

[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 e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4
Merge: cffad0ad3 b3932f39b
Author: Phil <address@hidden>
AuthorDate: Thu Aug 9 10:23:29 2018 +0200

    -Merge branch 'master' into gsoc2018/rest_api

 Dockerfile                                         |  102 ++
 README                                             |    8 +-
 README.md                                          |  268 ++++
 configure.ac                                       |    4 +-
 contrib/branding/logo/gnunet-logo-dark-text.svg    | 1411 ++++++++++++++++++++
 contrib/gnunet-arch-full.svg                       |  648 +++++++++
 contrib/packages/guix/notest-guix-env.scm          |  145 ++
 doc/documentation/chapters/preface.texi            |   67 +-
 doc/documentation/chapters/user.texi               |  364 ++++-
 doc/documentation/gnunet.texi                      |    3 +-
 docker/README.md                                   |  138 ++
 docker/docker-entrypoint.sh                        |   15 +
 docker/gnunet.conf                                 |   21 +
 po/POTFILES.in                                     |  137 +-
 src/Makefile.am                                    |    6 +-
 src/arm/test_exponential_backoff.c                 |    3 +
 src/cadet/cadet_api.c                              |    1 +
 src/core/test_core_api_reliability.c               |    4 +-
 src/core/test_core_quota_compliance.c              |    5 +-
 src/datacache/plugin_datacache_sqlite.c            |    5 +-
 src/identity-provider/identity-token.conf          |    2 -
 src/identity-provider/jwt.c                        |  189 ---
 src/identity-provider/jwt.h                        |    9 -
 src/identity-provider/test_idp.conf                |   33 -
 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_issue.sh            |   42 -
 src/identity-provider/test_idp_revoke.sh           |   65 -
 src/identity/gnunet-service-identity.c             |   49 +-
 src/include/Makefile.am                            |    2 +-
 src/include/gnunet_abe_lib.h                       |    2 +-
 src/include/gnunet_crypto_lib.h                    |   26 +-
 src/include/gnunet_gnsrecord_lib.h                 |   10 +
 src/include/gnunet_protocols.h                     |   30 +-
 ...ribute_lib.h => gnunet_reclaim_attribute_lib.h} |   64 +-
 ..._plugin.h => gnunet_reclaim_attribute_plugin.h} |   24 +-
 ...y_provider_plugin.h => gnunet_reclaim_plugin.h} |   28 +-
 ...provider_service.h => gnunet_reclaim_service.h} |  116 +-
 src/include/gnunet_signatures.h                    |    6 +-
 src/multicast/gnunet-service-multicast.c           |   18 +-
 src/multicast/test_multicast_multipeer.c           |    2 +
 .../Makefile.am                                    |   20 +-
 .../plugin_reclaim_attribute_gnuid.c}              |   22 +-
 .../reclaim_attribute.c}                           |  100 +-
 .../reclaim_attribute.h}                           |   10 +-
 src/{identity-provider => reclaim}/.gitignore      |    0
 src/{identity-provider => reclaim}/Makefile.am     |   95 +-
 .../gnunet-idp.c => reclaim/gnunet-reclaim.c}      |  148 +-
 .../gnunet-service-reclaim.c}                      |  204 +--
 src/reclaim/jwt.c                                  |    1 +
 src/reclaim/oidc_helper.c                          |  440 ++++++
 src/reclaim/oidc_helper.h                          |  109 ++
 .../plugin_gnsrecord_reclaim.c}                    |   12 +-
 .../plugin_reclaim_sqlite.c}                       |   72 +-
 .../plugin_rest_openid_connect.c                   |  787 ++++++-----
 .../plugin_rest_reclaim.c}                         |  118 +-
 .../reclaim.conf}                                  |   15 +-
 .../identity_provider.h => reclaim/reclaim.h}      |   24 +-
 .../reclaim_api.c}                                 |  345 +++--
 src/reclaim/test_reclaim.sh                        |   31 +
 src/reclaim/test_reclaim_attribute.sh              |   40 +
 src/reclaim/test_reclaim_consume.sh                |   43 +
 .../test_reclaim_defaults.conf}                    |    0
 src/reclaim/test_reclaim_issue.sh                  |   42 +
 src/reclaim/test_reclaim_revoke.sh                 |   65 +
 src/rest/Makefile.am                               |   12 +
 src/rest/plugin_rest_copying.c                     |  231 ++++
 src/rps/gnunet-rps-profiler.c                      |  284 ++--
 src/rps/gnunet-service-rps.c                       |  655 +++++----
 src/rps/gnunet-service-rps_custommap.c             |    2 +-
 src/rps/rps-test_util.c                            |   80 +-
 src/transport/test_quota_compliance.c              |    4 +-
 src/transport/test_transport_api_reliability.c     |    4 +-
 src/util/crypto_hash.c                             |   26 +-
 src/util/dnsparser.c                               |    2 +-
 src/util/scheduler.c                               |  189 +--
 77 files changed, 6104 insertions(+), 2314 deletions(-)

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