[gnunet] 02/04: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

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

t3sserakt pushed a commit to branch master
in repository gnunet.

commit 7a8531c1245983ab09a5bf146c9258321f7fa61a
Merge: 6e3ca264f 7ce054864
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Tue Dec 8 10:56:46 2020 +0100

    Merge branch 'master' of ssh://gnunet.org/gnunet

 po/POTFILES.in                                     |    4 +-
 src/reclaim/oidc_helper.c                          |   78 +-
 src/reclaim/oidc_helper.h                          |   38 +-
 src/reclaim/plugin_rest_openid_connect.c           |  151 +-
 src/rps/rps-test_util.c                            |   14 +-
 src/transport/Makefile.am                          |    8 +-
 src/transport/gnunet-communicator-udp.c            |   19 +-
 src/transport/test_communicator_basic.c            |    2 +-
 ...testing2.c => transport-testing-communicator.c} |   54 +-
 ...testing2.h => transport-testing-communicator.h} |    7 +-
 src/transport/transport-testing2.c                 | 1741 ++++++++------------
 src/transport/transport-testing2.h                 |  970 ++++++++---
 src/util/Makefile.am                               |    9 +-
 src/util/crypto-test-vectors.json                  |   56 +
 src/util/crypto_rsa.c                              |    4 +-
 src/util/gnunet-crypto-tvg.c                       |  874 +++++++++-
 src/util/perf_crypto_rsa.c                         |   14 +-
 src/util/test_crypto_vectors.sh                    |    3 +
 18 files changed, 2623 insertions(+), 1423 deletions(-)

diff --cc src/transport/gnunet-communicator-udp.c
index 4a91a70a5,073b1ea02..1f87ba6d4
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@@ -1741,13 -1668,9 +1741,12 @@@ static voi
  kce_generate_cb (void *cls)
  {
    struct SharedSecret *ss = cls;
- 
- 
+   kce_task = NULL;
  
 -  if (ss->sender->acks_available < KCN_TARGET)
 +  if (((GNUNET_NO == ss->sender->rekeying) && (ss->sender->acks_available <
 +                                               KCN_TARGET) ) ||
 +      ((ss->sender->ss_rekey == ss) && (GNUNET_YES == ss->sender->rekeying) &&
 +       (ss->sender->acks_available < 128)))
    {
  
      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.